@dxos/plugin-space 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/space',
+  id: 'org.dxos.plugin.space',
   name: 'Spaces',
   description: trim`
     Core workspace container system for organizing and sharing collaborative environments.

package/src/translations.ts

@@ -3,9 +3,9 @@
 //
 
 import { Type } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
-import { Collection } from '@dxos/schema';
-import { Event, Message, Organization, Person, Project, Task } from '@dxos/types';
+import { Event, Message, Organization, Person, Pipeline, Task } from '@dxos/types';
 
 import { meta } from './meta';
 
@@ -19,6 +19,7 @@ export const translations = [
         'typename label_one': 'Collection',
         'typename label_other': 'Collections',
         'object name placeholder': 'New collection',
+        'add object label': 'Add collection',
         'rename object label': 'Rename collection',
         'delete object label': 'Delete collection',
         'object deleted label': 'Collection deleted',
@@ -29,6 +30,7 @@ export const translations = [
         'typename label_one': 'Type',
         'typename label_other': 'Types',
         'object name placeholder': 'New type',
+        'add object label': 'Add type',
         'rename object label': 'Rename type',
         'delete object label': 'Delete type',
         'object deleted label': 'Type deleted',
@@ -39,6 +41,9 @@ export const translations = [
         'typename label_one': 'Event',
         'typename label_other': 'Events',
         'object name placeholder': 'New event',
+        'add object label': 'Add event',
+        'rename object label': 'Rename event',
+        'delete object label': 'Delete event',
       },
       [Message.Message.typename]: {
         'typename label': 'Message',
@@ -46,6 +51,9 @@ export const translations = [
         'typename label_one': 'Message',
         'typename label_other': 'Messages',
         'object name placeholder': 'New message',
+        'add object label': 'Add message',
+        'rename object label': 'Rename message',
+        'delete object label': 'Delete message',
       },
       [Organization.Organization.typename]: {
         'typename label': 'Organization',
@@ -53,6 +61,9 @@ export const translations = [
         'typename label_one': 'Organization',
         'typename label_other': 'Organizations',
         'object name placeholder': 'New organization',
+        'add object label': 'Add organization',
+        'rename object label': 'Rename organization',
+        'delete object label': 'Delete organization',
       },
       [Person.Person.typename]: {
         'typename label': 'Person',
@@ -60,13 +71,19 @@ export const translations = [
         'typename label_one': 'Person',
         'typename label_other': 'People',
         'object name placeholder': 'New person',
+        'add object label': 'Add person',
+        'rename object label': 'Rename person',
+        'delete object label': 'Delete person',
       },
-      [Project.Project.typename]: {
+      [Pipeline.Pipeline.typename]: {
         'typename label': 'Project',
         'typename label_zero': 'Projects',
         'typename label_one': 'Project',
         'typename label_other': 'Projects',
         'object name placeholder': 'New project',
+        'add object label': 'Add project',
+        'rename object label': 'Rename project',
+        'delete object label': 'Delete project',
       },
       [Task.Task.typename]: {
         'typename label': 'Task',
@@ -74,6 +91,9 @@ export const translations = [
         'typename label_one': 'Task',
         'typename label_other': 'Tasks',
         'object name placeholder': 'New task',
+        'add object label': 'Add task',
+        'rename object label': 'Rename task',
+        'delete object label': 'Delete task',
       },
       [meta.id]: {
         'plugin name': 'Spaces',
@@ -131,8 +151,10 @@ export const translations = [
           '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',
+        'remove from collection label': 'Remove from collection',
         'create object in system collection label': 'Add to system collection',
-        'add view to schema label': 'Add view to type',
+        'new type label': 'New type',
+        'add view to schema label': 'Add view for type',
         'space members label': 'Space members',
         'active space members heading': 'Online ({{count}})',
         'inactive space members heading': 'Offline ({{count}})',
@@ -239,6 +261,10 @@ export const translations = [
         'sync upload label': 'Upload',
         'sync download label': 'Download',
 
+        'types section label': 'Types',
+        'collections section label': 'Collections',
+        'type collection all label': 'All',
+
         'search placeholder': 'Search…',
       },
     },

package/src/types/capabilities.ts

@@ -9,9 +9,9 @@ import * as Schema from 'effect/Schema';
 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 PublicKey } from '@dxos/keys';
 import { type Operation } from '@dxos/operation';
-import { type Collection } from '@dxos/schema';
 import { type Label } from '@dxos/ui-types';
 import { type ComplexMap, type Position } from '@dxos/util';
 
@@ -20,7 +20,7 @@ import { meta } from '../meta';
 import { type ObjectViewerProps, type SpaceSettingsProps } from './types';
 
 export namespace SpaceCapabilities {
-  export const Settings = Capability.make<Atom.Writable<SpaceSettingsProps>>(`${meta.id}/capability/settings`);
+  export const Settings = Capability.make<Atom.Writable<SpaceSettingsProps>>(`${meta.id}.capability.settings`);
 
   /** Schema for persisted space plugin state. */
   export const StateSchema = Schema.mutable(
@@ -33,7 +33,7 @@ export namespace SpaceCapabilities {
   export type SpaceState = Schema.Schema.Type<typeof StateSchema>;
 
   /** Persisted state (stored in KVS/localStorage). */
-  export const State = Capability.make<Atom.Writable<SpaceState>>(`${meta.id}/capability/state`);
+  export const State = Capability.make<Atom.Writable<SpaceState>>(`${meta.id}.capability.state`);
 
   /** Ephemeral space plugin state (not persisted). */
   export type SpaceEphemeralState = {
@@ -46,18 +46,18 @@ export namespace SpaceCapabilities {
 
   /** Transient/ephemeral state (not persisted). */
   export const EphemeralState = Capability.make<Atom.Writable<SpaceEphemeralState>>(
-    `${meta.id}/capability/ephemeral-state`,
+    `${meta.id}.capability.ephemeral-state`,
   );
 
   export type SettingsSection = { id: string; label: Label; position?: Position };
-  export const SettingsSection = Capability.make<SettingsSection>(`${meta.id}/capability/settings-section`);
+  export const SettingsSection = Capability.make<SettingsSection>(`${meta.id}.capability.settings-section`);
 
   export type OnCreateSpace = (params: {
     space: Space;
     isDefault: boolean;
     rootCollection: Collection.Collection;
   }) => Effect.Effect<void, Error, Operation.Service>;
-  export const OnCreateSpace = Capability.make<OnCreateSpace>(`${meta.id}/capability/on-space-created`);
+  export const OnCreateSpace = Capability.make<OnCreateSpace>(`${meta.id}.capability.on-space-created`);
 
   export type OnSchemaAdded = (params: {
     db: Database.Database;
@@ -65,9 +65,9 @@ export namespace SpaceCapabilities {
     // 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 OnSchemaAdded = Capability.make<OnSchemaAdded>(`${meta.id}.capability.on-schema-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`);
+  export const Repair = Capability.make<HandleRepair>(`${meta.id}.capability.repair`);
 }

package/src/types/events.ts

@@ -2,14 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ActivationEvent, Common } from '@dxos/app-framework';
+import { ActivationEvent } from '@dxos/app-framework';
+import { AppActivationEvents } from '@dxos/app-toolkit';
 
 import { meta } from '../meta';
 
 export namespace SpaceEvents {
-  export const StateReady = Common.ActivationEvent.createStateEvent(`${meta.id}/event/state-ready`);
-  export const SetupSettingsPanel = ActivationEvent.make(`${meta.id}/event/setup-settings-panel`);
-  export const DefaultSpaceReady = ActivationEvent.make(`${meta.id}/event/default-space-ready`);
-  export const SpaceCreated = ActivationEvent.make(`${meta.id}/event/space-created`);
-  export const SchemaAdded = ActivationEvent.make(`${meta.id}/event/schema-added`);
+  export const StateReady = AppActivationEvents.createStateEvent(`${meta.id}.event.state-ready`);
+  export const SetupSettingsPanel = ActivationEvent.make(`${meta.id}.event.setup-settings-panel`);
+  export const DefaultSpaceReady = ActivationEvent.make(`${meta.id}.event.default-space-ready`);
+  export const SpaceCreated = ActivationEvent.make(`${meta.id}.event.space-created`);
+  export const SchemaAdded = ActivationEvent.make(`${meta.id}.event.schema-added`);
 }

package/src/types/form.ts

@@ -12,7 +12,6 @@ import { EntityKind, SystemTypeAnnotation, createAnnotationHelper, getTypeAnnota
 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>;
@@ -29,8 +28,6 @@ export const getTypenames = ({ annotation, space }: { annotation: TypeInputOptio
   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 && space
@@ -50,15 +47,11 @@ export const getTypenames = ({ annotation, space }: { annotation: TypeInputOptio
 
             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
+    includeDatabase && space
       ? space.db.schemaRegistry
           .query({ location: ['database'] })
           .runSync()

package/src/types/types.ts

@@ -10,27 +10,32 @@ import { type PublicKey } from '@dxos/client';
 // TODO(wittjosiah): This pulls in full client.
 import { SpaceSchema } from '@dxos/client/echo';
 import { CancellableInvitationObservable, Invitation } from '@dxos/client/invitations';
-import { Database, type Obj, QueryAST, Type } from '@dxos/echo';
+import { Database, Obj, QueryAST, Type } from '@dxos/echo';
+import { Collection, View } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
-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_DIRECTORY_HANDLE = `${meta.id}/directory`;
-
-export const SPACE_TYPE = 'dxos.org/type/Space';
+export const SPACE_TYPE = 'org.dxos.type.space';
 
 export type SpacePluginOptions = {
   /**
-   * Base URL for the invitation link.
+   * Origin used for shareable links (object copy-link and invitation base).
+   * Defaults to window.location.origin.
+   */
+  shareableLinkOrigin?: string;
+
+  /**
+   * Path appended to shareableLinkOrigin to form the invitation base URL.
+   * Defaults to '/'.
    */
-  invitationUrl?: string;
+  invitationPath?: string;
 
   /**
-   * Query parameter for the invitation code.
+   * Query parameter name for the invitation code.
    */
   invitationProp?: string;
 
@@ -137,11 +142,11 @@ export const SpaceForm = Schema.Struct({
   edgeReplication: Schema.optional(Schema.Boolean.annotations({ title: 'Enable EDGE Replication' })),
 });
 
-const COLLECTION_OPERATION = 'dxos.org/plugin/collection/operation';
+const COLLECTION_OPERATION = 'org.dxos.plugin.collection.operation';
 
 export namespace CollectionOperation {
   export const Create = Operation.make({
-    meta: { key: `${COLLECTION_OPERATION}/create`, name: 'Create Collection' },
+    meta: { key: `${COLLECTION_OPERATION}.create`, name: 'Create Collection' },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
@@ -154,7 +159,7 @@ export namespace CollectionOperation {
   });
 }
 
-const SPACE_OPERATION = `${meta.id}/operation`;
+const SPACE_OPERATION = `${meta.id}.operation`;
 
 /**
  * Operations for the Space plugin.
@@ -162,7 +167,7 @@ const SPACE_OPERATION = `${meta.id}/operation`;
 export namespace SpaceOperation {
   export const Create = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/create`,
+      key: `${SPACE_OPERATION}.create`,
       name: 'Create Space',
       description: 'Create a new space.',
     },
@@ -179,7 +184,7 @@ export namespace SpaceOperation {
 
   export const Join = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/join`,
+      key: `${SPACE_OPERATION}.join`,
       name: 'Join Space',
       description: 'Join a space via invitation.',
     },
@@ -195,7 +200,7 @@ export namespace SpaceOperation {
 
   export const Open = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/open`,
+      key: `${SPACE_OPERATION}.open`,
       name: 'Open Space',
       description: 'Open a space.',
     },
@@ -210,7 +215,7 @@ export namespace SpaceOperation {
 
   export const Close = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/close`,
+      key: `${SPACE_OPERATION}.close`,
       name: 'Close Space',
       description: 'Close a space.',
     },
@@ -225,7 +230,7 @@ export namespace SpaceOperation {
 
   export const Share = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/share`,
+      key: `${SPACE_OPERATION}.share`,
       name: 'Share Space',
       description: 'Share a space.',
     },
@@ -245,7 +250,7 @@ export namespace SpaceOperation {
   // TODO(wittjosiah): This appears to be unused.
   export const Lock = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/lock`,
+      key: `${SPACE_OPERATION}.lock`,
       name: 'Lock Space',
       description: 'Lock a space to prevent modifications.',
     },
@@ -261,7 +266,7 @@ export namespace SpaceOperation {
   // TODO(wittjosiah): This appears to be unused.
   export const Unlock = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/unlock`,
+      key: `${SPACE_OPERATION}.unlock`,
       name: 'Unlock Space',
       description: 'Unlock a space to allow modifications.',
     },
@@ -276,7 +281,7 @@ export namespace SpaceOperation {
 
   export const OpenSettings = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/open-settings`,
+      key: `${SPACE_OPERATION}.open-settings`,
       name: 'Open Space Settings',
       description: 'Open space settings.',
     },
@@ -291,7 +296,7 @@ export namespace SpaceOperation {
 
   export const WaitForObject = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/wait-for-object`,
+      key: `${SPACE_OPERATION}.wait-for-object`,
       name: 'Wait For Object',
       description: 'Wait for an object to be available.',
     },
@@ -306,32 +311,35 @@ export namespace SpaceOperation {
 
   export const AddObject = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/add-object`,
+      key: `${SPACE_OPERATION}.add-object`,
       name: 'Add Object',
       description: 'Add an object to a space.',
     },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        object: Type.Obj.annotations({ description: 'The object to add.' }),
+        object: Obj.Unknown.annotations({ description: 'The object to add.' }),
         target: Schema.Union(Database.Database, Collection.Collection).annotations({
           description: 'The database or collection to add to.',
         }),
         hidden: Schema.optional(Schema.Boolean),
+        targetNodeId: Schema.optional(
+          Schema.String.annotations({ description: 'Qualified graph node ID of the target collection.' }),
+        ),
       }),
       output: Schema.Struct({
         id: Schema.String,
         subject: Schema.Array(Schema.String),
-        object: Type.Obj,
+        object: Obj.Unknown,
       }),
     },
   });
 
   export const RemoveObjectsOutput = Schema.Struct({
-    objects: Schema.Array(Type.Obj).annotations({ description: 'The removed objects.' }),
+    objects: Schema.Array(Obj.Unknown).annotations({ description: 'The removed objects.' }),
     parentCollection: Collection.Collection.annotations({ description: 'The collection removed from.' }),
     indices: Schema.Array(Schema.Number).annotations({ description: 'The indices the objects were at.' }),
-    nestedObjectsList: Schema.Array(Schema.Array(Type.Obj)).annotations({
+    nestedObjectsList: Schema.Array(Schema.Array(Obj.Unknown)).annotations({
       description: 'Nested objects that were removed.',
     }),
     wasActive: Schema.Array(Schema.String).annotations({
@@ -343,14 +351,14 @@ export namespace SpaceOperation {
 
   export const RemoveObjects = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/remove-objects`,
+      key: `${SPACE_OPERATION}.remove-objects`,
       name: 'Remove Objects',
       description: 'Remove objects from a space.',
     },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        objects: Schema.Array(Type.Obj).annotations({ description: 'The objects to remove.' }),
+        objects: Schema.Array(Obj.Unknown).annotations({ description: 'The objects to remove.' }),
         target: Schema.optional(Collection.Collection).annotations({ description: 'The collection to remove from.' }),
       }),
       output: RemoveObjectsOutput,
@@ -358,7 +366,7 @@ export namespace SpaceOperation {
   });
 
   export const DeleteFieldOutput = Schema.Struct({
-    field: FieldSchema.annotations({ description: 'The deleted field schema.' }),
+    field: View.FieldSchema.annotations({ description: 'The deleted field schema.' }),
     // TODO(wittjosiah): This creates a type error with PropertySchema.
     props: Schema.Any.annotations({ description: 'The deleted field properties.' }),
     index: Schema.Number.annotations({ description: 'The index the field was at.' }),
@@ -368,7 +376,7 @@ export namespace SpaceOperation {
 
   export const DeleteField = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/delete-field`,
+      key: `${SPACE_OPERATION}.delete-field`,
       name: 'Delete Field',
       description: 'Delete a field from a view.',
     },
@@ -384,7 +392,7 @@ export namespace SpaceOperation {
 
   export const OpenCreateObject = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/open-create-object`,
+      key: `${SPACE_OPERATION}.open-create-object`,
       name: 'Open Create Object Dialog',
       description: 'Open the create object dialog.',
     },
@@ -398,6 +406,9 @@ export namespace SpaceOperation {
         typename: Schema.optional(Schema.String),
         initialFormValues: Schema.optional(Schema.Any),
         navigable: Schema.optional(Schema.Boolean),
+        targetNodeId: Schema.optional(
+          Schema.String.annotations({ description: 'Qualified graph node ID of the target collection.' }),
+        ),
         // TODO(wittjosiah): This is a function, is there a better way to handle this?
         onCreateObject: Schema.optional(Schema.Any),
       }),
@@ -407,7 +418,7 @@ export namespace SpaceOperation {
 
   export const OpenCreateSpace = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/open-create-space`,
+      key: `${SPACE_OPERATION}.open-create-space`,
       name: 'Open Create Space Dialog',
       description: 'Open the create space dialog.',
     },
@@ -420,7 +431,7 @@ export namespace SpaceOperation {
 
   export const Migrate = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/migrate`,
+      key: `${SPACE_OPERATION}.migrate`,
       name: 'Migrate Space',
       description: 'Migrate a space to a new version.',
     },
@@ -436,7 +447,7 @@ export namespace SpaceOperation {
 
   export const Snapshot = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/snapshot`,
+      key: `${SPACE_OPERATION}.snapshot`,
       name: 'Create Snapshot',
       description: 'Create a snapshot of the space.',
     },
@@ -454,7 +465,7 @@ export namespace SpaceOperation {
 
   export const Rename = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/rename`,
+      key: `${SPACE_OPERATION}.rename`,
       name: 'Rename Space',
       description: 'Rename a space.',
     },
@@ -470,14 +481,14 @@ export namespace SpaceOperation {
 
   export const RenameObject = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/rename-object`,
+      key: `${SPACE_OPERATION}.rename-object`,
       name: 'Rename Object',
       description: 'Rename an object.',
     },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        object: Type.Obj,
+        object: Obj.Unknown,
         caller: Schema.optional(Schema.String),
       }),
       output: Schema.Void,
@@ -486,7 +497,7 @@ export namespace SpaceOperation {
 
   export const OpenMembers = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/open-members`,
+      key: `${SPACE_OPERATION}.open-members`,
       name: 'Open Members',
       description: 'Open the members panel for a space.',
     },
@@ -501,7 +512,7 @@ export namespace SpaceOperation {
 
   export const GetShareLink = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/get-share-link`,
+      key: `${SPACE_OPERATION}.get-share-link`,
       name: 'Get Share Link',
       description: 'Get a shareable link for a space.',
     },
@@ -518,37 +529,11 @@ export namespace SpaceOperation {
 
   export const StoredSchemaForm = Schema.Struct({
     name: Schema.optional(Schema.String),
-    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,
-    ),
-  });
-
-  export const UseStaticSchema = Operation.make({
-    meta: {
-      key: `${SPACE_OPERATION}/use-static-schema`,
-      name: 'Use Static Schema',
-      description: 'Use a static schema in the space.',
-    },
-    services: [Capability.Service, Plugin.Service],
-    schema: {
-      input: Schema.Struct({
-        db: Database.Database,
-        typename: Schema.String,
-        show: Schema.optional(Schema.Boolean),
-      }),
-      output: Schema.Struct({}),
-    },
   });
 
   export const AddSchema = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/add-schema`,
+      key: `${SPACE_OPERATION}.add-schema`,
       name: 'Add Schema',
       description: 'Add a schema to the space.',
     },
@@ -573,7 +558,7 @@ export namespace SpaceOperation {
 
   export const AddRelation = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/add-relation`,
+      key: `${SPACE_OPERATION}.add-relation`,
       name: 'Add Relation',
       description: 'Add a relation between objects.',
     },
@@ -583,8 +568,8 @@ export namespace SpaceOperation {
         db: Database.Database,
         // TODO(wittjosiah): Relation schema.
         schema: Schema.Any,
-        source: Type.Obj,
-        target: Type.Obj,
+        source: Obj.Unknown,
+        target: Obj.Unknown,
         // TODO(wittjosiah): Type based on relation schema.
         fields: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
       }),
@@ -597,14 +582,14 @@ export namespace SpaceOperation {
   // TODO(wittjosiah): This appears to be unused.
   export const DuplicateObject = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/duplicate-object`,
+      key: `${SPACE_OPERATION}.duplicate-object`,
       name: 'Duplicate Object',
       description: 'Duplicate an object.',
     },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        object: Type.Obj,
+        object: Obj.Unknown,
         target: Schema.Union(Database.Database, Collection.Collection),
       }),
       output: Schema.Void,
@@ -616,7 +601,7 @@ export namespace SpaceOperation {
    */
   export const RestoreField = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/restore-field`,
+      key: `${SPACE_OPERATION}.restore-field`,
       name: 'Restore Field',
       description: 'Restore a deleted field to a view.',
     },
@@ -624,7 +609,7 @@ export namespace SpaceOperation {
     schema: {
       input: Schema.Struct({
         view: View.View.annotations({ description: 'The view to restore the field to.' }),
-        field: FieldSchema.annotations({ description: 'The field schema to restore.' }),
+        field: View.FieldSchema.annotations({ description: 'The field schema to restore.' }),
         // TODO(wittjosiah): This creates a type error with PropertySchema.
         props: Schema.Any.annotations({ description: 'The field properties to restore.' }),
         index: Schema.Number.annotations({ description: 'The index to restore the field at.' }),
@@ -638,17 +623,17 @@ export namespace SpaceOperation {
    */
   export const RestoreObjects = Operation.make({
     meta: {
-      key: `${SPACE_OPERATION}/restore-objects`,
+      key: `${SPACE_OPERATION}.restore-objects`,
       name: 'Restore Objects',
       description: 'Restore deleted objects to a space.',
     },
     services: [Capability.Service],
     schema: {
       input: Schema.Struct({
-        objects: Schema.Array(Type.Obj).annotations({ description: 'The objects to restore.' }),
+        objects: Schema.Array(Obj.Unknown).annotations({ description: 'The objects to restore.' }),
         parentCollection: Collection.Collection.annotations({ description: 'The collection to restore to.' }),
         indices: Schema.Array(Schema.Number).annotations({ description: 'The indices to restore at.' }),
-        nestedObjectsList: Schema.Array(Schema.Array(Type.Obj)).annotations({
+        nestedObjectsList: Schema.Array(Schema.Array(Obj.Unknown)).annotations({
           description: 'Nested objects to restore.',
         }),
         wasActive: Schema.Array(Schema.String).annotations({