@dxos/plugin-space 0.7.5-labs.c0e040f → 0.7.5-labs.d199c0f

package/dist/types/src/types/types.d.ts

@@ -1,4 +1,5 @@
-import { S, type Expando } from '@dxos/echo-schema';
+import { type AnyIntentChain } from '@dxos/app-framework';
+import { S, type Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { type ComplexMap } from '@dxos/util';
@@ -67,6 +68,14 @@ export declare const SpaceForm: S.Struct<{
     name: S.optional<S.SchemaClass<string, string, never>>;
     edgeReplication: S.SchemaClass<boolean, boolean, never>;
 }>;
+export type ObjectForm<T extends BaseObject = BaseObject> = {
+    objectSchema: TypedObject;
+    formSchema?: S.Schema<T, any>;
+    getIntent: (props: T, options: {
+        space: Space;
+    }) => AnyIntentChain;
+};
+export declare const defineObjectForm: <T extends BaseObject>(form: ObjectForm<T>) => ObjectForm<T>;
 export declare const SPACE_ACTION = "dxos.org/plugin/space/action";
 export declare namespace SpaceAction {
     const OpenCreateSpace_base: S.TaggedClass<OpenCreateSpace, "dxos.org/plugin/space/action/open-create-space", {
@@ -144,6 +153,22 @@ export declare namespace SpaceAction {
     }>;
     export class Rename extends Rename_base {
     }
+    const AddSpace_base: S.TaggedClass<AddSpace, "dxos.org/plugin/space/action/add-space", {
+        readonly _tag: S.tag<"dxos.org/plugin/space/action/add-space">;
+    } & {
+        input: typeof S.Void;
+        output: typeof S.Void;
+    }>;
+    export class AddSpace extends AddSpace_base {
+    }
+    const AddSpaceMenuGroup_base: S.TaggedClass<AddSpaceMenuGroup, "dxos.org/plugin/space/action/add-space-menu-group", {
+        readonly _tag: S.tag<"dxos.org/plugin/space/action/add-space-menu-group">;
+    } & {
+        input: typeof S.Void;
+        output: typeof S.Void;
+    }>;
+    export class AddSpaceMenuGroup extends AddSpaceMenuGroup_base {
+    }
     const OpenSettings_base: S.TaggedClass<OpenSettings, "dxos.org/plugin/space/action/open-settings", {
         readonly _tag: S.tag<"dxos.org/plugin/space/action/open-settings">;
     } & {
@@ -200,22 +225,22 @@ export declare namespace SpaceAction {
         readonly _tag: S.tag<"dxos.org/plugin/space/action/add-object">;
     } & {
         input: S.Struct<{
-            object: S.Schema<import("@dxos/react-client/echo").ReactiveObject<any>, import("@dxos/react-client/echo").ReactiveObject<any>, never>;
+            object: S.Schema<import("@dxos/live-object").ReactiveObject<any>, import("@dxos/live-object").ReactiveObject<any>, never>;
             target: S.Union<[S.Schema<Space, Space, never>, typeof CollectionType]>;
         }>;
         output: S.Struct<{
             id: typeof S.String;
             subject: S.Array$<typeof S.String>;
-            object: S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>;
+            object: S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>;
         }>;
     }>;
     export class AddObject extends AddObject_base {
     }
     export const DeletionData: S.Struct<{
-        objects: S.Array$<S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>>;
+        objects: S.Array$<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>;
         parentCollection: typeof CollectionType;
         indices: S.Array$<typeof S.Number>;
-        nestedObjectsList: S.Array$<S.Array$<S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>>>;
+        nestedObjectsList: S.Array$<S.Array$<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>>;
         wasActive: S.Array$<typeof S.String>;
     }>;
     export type DeletionData = S.Schema.Type<typeof DeletionData>;
@@ -223,13 +248,13 @@ export declare namespace SpaceAction {
         readonly _tag: S.tag<"dxos.org/plugin/space/action/remove-objects">;
     } & {
         input: S.Struct<{
-            objects: S.Array$<S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>>;
+            objects: S.Array$<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>;
             target: S.optional<typeof CollectionType>;
             deletionData: S.optional<S.Struct<{
-                objects: S.Array$<S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>>;
+                objects: S.Array$<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>;
                 parentCollection: typeof CollectionType;
                 indices: S.Array$<typeof S.Number>;
-                nestedObjectsList: S.Array$<S.Array$<S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>>>;
+                nestedObjectsList: S.Array$<S.Array$<S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>>>;
                 wasActive: S.Array$<typeof S.String>;
             }>>;
         }>;
@@ -241,7 +266,7 @@ export declare namespace SpaceAction {
         readonly _tag: S.tag<"dxos.org/plugin/space/action/rename-object">;
     } & {
         input: S.Struct<{
-            object: S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>;
+            object: S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>;
             caller: S.optional<typeof S.String>;
         }>;
         output: typeof S.Void;
@@ -252,7 +277,7 @@ export declare namespace SpaceAction {
         readonly _tag: S.tag<"dxos.org/plugin/space/action/duplicate-object">;
     } & {
         input: S.Struct<{
-            object: S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>;
+            object: S.Schema<import("@dxos/echo-db").ReactiveEchoObject<any>, import("@dxos/echo-db").ReactiveEchoObject<any>, never>;
             target: S.Union<[S.Schema<Space, Space, never>, typeof CollectionType]>;
         }>;
         output: typeof S.Void;

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}

package/dist/types/src/util.d.ts

@@ -27,7 +27,7 @@ export declare const constructSpaceNode: ({ space, navigable, personal, namesCac
     namesCache?: Record<string, string>;
     resolve: (typename: string) => Record<string, any>;
 }) => {
-    id: import("@dxos/react-client/echo").SpaceId;
+    id: import("@dxos/keys").SpaceId;
     type: string;
     cacheable: string[];
     data: Space;
@@ -37,7 +37,7 @@ export declare const constructSpaceNode: ({ space, navigable, personal, namesCac
         }];
         description: any;
         hue: any;
-        icon: string;
+        icon: string | undefined;
         disabled: boolean;
         testId: string;
     };

package/dist/types/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.7.5-labs.c0e040f",
+  "version": "0.7.5-labs.d199c0f",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -40,38 +41,38 @@
     "lodash.get": "^4.4.2",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
-    "@dxos/app-framework": "0.7.5-labs.c0e040f",
-    "@dxos/automerge": "0.7.5-labs.c0e040f",
-    "@dxos/async": "0.7.5-labs.c0e040f",
-    "@dxos/client": "0.7.5-labs.c0e040f",
-    "@dxos/display-name": "0.7.5-labs.c0e040f",
-    "@dxos/context": "0.7.5-labs.c0e040f",
-    "@dxos/echo-schema": "0.7.5-labs.c0e040f",
-    "@dxos/echo-signals": "0.7.5-labs.c0e040f",
-    "@dxos/live-object": "0.7.5-labs.c0e040f",
-    "@dxos/invariant": "0.7.5-labs.c0e040f",
-    "@dxos/keys": "0.7.5-labs.c0e040f",
-    "@dxos/local-storage": "0.7.5-labs.c0e040f",
-    "@dxos/migrations": "0.7.5-labs.c0e040f",
-    "@dxos/log": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-attention": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-deck": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-client": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-graph": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-observability": "0.7.5-labs.c0e040f",
-    "@dxos/protocols": "0.7.5-labs.c0e040f",
-    "@dxos/plugin-status-bar": "0.7.5-labs.c0e040f",
-    "@dxos/react-client": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-attention": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-editor": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-pickers": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-form": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-stack": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-searchlist": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.c0e040f",
-    "@dxos/shell": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-tabs": "0.7.5-labs.c0e040f",
-    "@dxos/util": "0.7.5-labs.c0e040f"
+    "@dxos/app-framework": "0.7.5-labs.d199c0f",
+    "@dxos/async": "0.7.5-labs.d199c0f",
+    "@dxos/automerge": "0.7.5-labs.d199c0f",
+    "@dxos/client": "0.7.5-labs.d199c0f",
+    "@dxos/context": "0.7.5-labs.d199c0f",
+    "@dxos/display-name": "0.7.5-labs.d199c0f",
+    "@dxos/echo-signals": "0.7.5-labs.d199c0f",
+    "@dxos/keys": "0.7.5-labs.d199c0f",
+    "@dxos/echo-schema": "0.7.5-labs.d199c0f",
+    "@dxos/live-object": "0.7.5-labs.d199c0f",
+    "@dxos/invariant": "0.7.5-labs.d199c0f",
+    "@dxos/local-storage": "0.7.5-labs.d199c0f",
+    "@dxos/log": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-attention": "0.7.5-labs.d199c0f",
+    "@dxos/migrations": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-observability": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-client": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-graph": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-deck": "0.7.5-labs.d199c0f",
+    "@dxos/plugin-status-bar": "0.7.5-labs.d199c0f",
+    "@dxos/protocols": "0.7.5-labs.d199c0f",
+    "@dxos/react-client": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-attention": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-editor": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-form": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-pickers": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-stack": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-searchlist": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.d199c0f",
+    "@dxos/shell": "0.7.5-labs.d199c0f",
+    "@dxos/util": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-tabs": "0.7.5-labs.d199c0f"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -82,17 +83,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-theme": "0.7.5-labs.c0e040f",
-    "@dxos/storybook-utils": "0.7.5-labs.c0e040f"
+    "@dxos/react-ui": "0.7.5-labs.d199c0f",
+    "@dxos/random": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-theme": "0.7.5-labs.d199c0f",
+    "@dxos/storybook-utils": "0.7.5-labs.d199c0f"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-labs.c0e040f",
-    "@dxos/react-ui-theme": "0.7.5-labs.c0e040f"
+    "@dxos/react-ui": "0.7.5-labs.d199c0f",
+    "@dxos/react-ui-theme": "0.7.5-labs.d199c0f"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -12,10 +12,12 @@ import {
   Events,
   oneOf,
 } from '@dxos/app-framework';
+import { S } from '@dxos/echo-schema';
 import { RefArray } from '@dxos/live-object';
 import { AttentionEvents } from '@dxos/plugin-attention';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DeckCapabilities } from '@dxos/plugin-deck';
+import { ClientEvents } from '@dxos/plugin-client';
+import { DeckCapabilities, DeckEvents } from '@dxos/plugin-deck';
+import { isEchoObject, getSpace } from '@dxos/react-client/echo';
 import { osTranslations } from '@dxos/shell/react';
 
 import {
@@ -25,6 +27,8 @@ import {
   IntentResolver,
   ReactRoot,
   ReactSurface,
+  Schema,
+  SpaceCapabilities,
   SpaceSettings,
   SpacesReady,
   SpaceState,
@@ -32,7 +36,7 @@ import {
 import { SpaceEvents } from './events';
 import { meta, SPACE_PLUGIN } from './meta';
 import translations from './translations';
-import { CollectionAction, CollectionType } from './types';
+import { CollectionAction, CollectionType, defineObjectForm } from './types';
 
 export type SpacePluginOptions = {
   /**
@@ -65,7 +69,10 @@ export const SpacePlugin = ({
   return definePlugin(meta, [
     defineModule({
       id: `${meta.id}/module/state`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+      // TODO(wittjosiah): Does not integrate with settings store.
+      //   Should this be a different event?
+      //   Should settings store be renamed to be more generic?
+      activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
       activatesAfter: [SpaceEvents.StateReady],
       activate: SpaceState,
     }),
@@ -86,7 +93,6 @@ export const SpacePlugin = ({
         contributes(Capabilities.Metadata, {
           id: CollectionType.typename,
           metadata: {
-            createObject: (props: { name?: string }) => createIntent(CollectionAction.Create, props),
             placeholder: ['unnamed collection label', { ns: SPACE_PLUGIN }],
             icon: 'ph--cards-three--regular',
             // TODO(wittjosiah): Move out of metadata.
@@ -95,20 +101,36 @@ export const SpacePlugin = ({
           },
         }),
     }),
+    defineModule({
+      id: `${meta.id}/module/object-form`,
+      activatesOn: ClientEvents.SetupSchema,
+      activate: () =>
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: CollectionType,
+            formSchema: S.Struct({ name: S.optional(S.String) }),
+            getIntent: (props) => createIntent(CollectionAction.Create, props),
+          }),
+        ),
+    }),
     defineModule({
       id: `${meta.id}/module/complementary-panel`,
-      activatesOn: Events.Startup,
+      activatesOn: DeckEvents.SetupComplementaryPanels,
       activate: () =>
         contributes(DeckCapabilities.ComplementaryPanel, {
           id: 'settings',
           label: ['settings panel label', { ns: SPACE_PLUGIN }],
           icon: 'ph--sliders--regular',
+          position: 'hoist',
+          filter: (node) => isEchoObject(node.data) && !!getSpace(node.data),
         }),
     }),
     defineModule({
       id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [CollectionType]),
+      activatesOn: ClientEvents.ClientReady,
+      activatesBefore: [ClientEvents.SetupSchema],
+      activate: Schema,
     }),
     defineModule({
       id: `${meta.id}/module/react-root`,
@@ -117,12 +139,14 @@ export const SpacePlugin = ({
     }),
     defineModule({
       id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupSurfaces,
+      activatesOn: Events.SetupReactSurface,
+      // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
+      activatesBefore: [SpaceEvents.SetupSettingsPanel],
       activate: () => ReactSurface({ createInvitationUrl }),
     }),
     defineModule({
       id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntents,
+      activatesOn: Events.SetupIntentResolver,
       activate: (context) => IntentResolver({ createInvitationUrl, context, observability }),
     }),
     defineModule({
@@ -133,7 +157,7 @@ export const SpacePlugin = ({
     // TODO(wittjosiah): This could probably be deferred.
     defineModule({
       id: `${meta.id}/module/app-graph-serializer`,
-      activatesOn: Events.Startup,
+      activatesOn: Events.AppGraphReady,
       activate: AppGraphSerializer,
     }),
     defineModule({

package/src/capabilities/app-graph-builder.ts

@@ -11,16 +11,15 @@ import {
   isEchoObject,
   isSpace,
   OBJECT_ID_LENGTH,
-  parseId,
   type ReactiveEchoObject,
   SPACE_ID_LENGTH,
   SpaceState,
   type Space,
 } from '@dxos/client/echo';
-import { getTypename, isDeleted } from '@dxos/live-object';
+import { isDeleted } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { createExtension, toSignal, type Node } from '@dxos/plugin-graph';
+import { createExtension, toSignal, type Node, type InvokeParams } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
 import { SpaceCapabilities } from './capabilities';
@@ -85,29 +84,17 @@ export default (context: PluginsContext) => {
       filter: (node): node is Node<null> => node.id === 'root',
       actions: () => [
         {
-          id: SpaceAction.OpenCreateSpace._tag,
-          data: async () => {
+          id: SpaceAction.AddSpace._tag,
+          data: async (params: InvokeParams) => {
             const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(SpaceAction.OpenCreateSpace));
+            await dispatch(createIntent(SpaceAction.AddSpace));
           },
           properties: {
-            label: ['create space label', { ns: SPACE_PLUGIN }],
+            label: ['add space label', { ns: SPACE_PLUGIN }],
             icon: 'ph--plus--regular',
-            testId: 'spacePlugin.createSpace',
-            disposition: 'item',
-          },
-        },
-        {
-          id: SpaceAction.Join._tag,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(SpaceAction.Join));
-          },
-          properties: {
-            label: ['join space label', { ns: SPACE_PLUGIN }],
-            icon: 'ph--sign-in--regular',
-            testId: 'spacePlugin.joinSpace',
+            testId: 'spacePlugin.addSpace',
             disposition: 'item',
+            position: 'fallback',
           },
         },
       ],
@@ -197,6 +184,8 @@ export default (context: PluginsContext) => {
 
         if (space.state.get() === SpaceState.SPACE_INACTIVE) {
           return false;
+        } else if (space.state.get() !== SpaceState.SPACE_READY) {
+          return undefined;
         } else {
           const state = context.requestCapability(SpaceCapabilities.State);
           return constructSpaceNode({
@@ -326,68 +315,5 @@ export default (context: PluginsContext) => {
         return constructObjectActions({ node, dispatch, navigable: state.navigableCollections });
       },
     }),
-
-    // Create nodes for object settings.
-    createExtension({
-      id: `${SPACE_PLUGIN}/settings-for-subject`,
-      resolver: ({ id }) => {
-        if (!id.endsWith('~settings')) {
-          return;
-        }
-
-        const type = 'orphan-settings-for-subject';
-        const icon = 'ph--gear--regular';
-
-        const [subjectId] = id.split('~');
-        const { spaceId, objectId } = parseId(subjectId);
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const spaces = toSignal(
-          (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-          () => client.spaces.get(),
-        );
-        const space = spaces?.find((space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY);
-        if (!objectId) {
-          const label = space
-            ? space.properties.name || ['unnamed space label', { ns: SPACE_PLUGIN }]
-            : ['unnamed object settings label', { ns: SPACE_PLUGIN }];
-
-          // TODO(wittjosiah): Support comments for arbitrary subjects.
-          //   This is to ensure that the comments panel is not stuck on an old object.
-          return {
-            id,
-            type,
-            data: null,
-            properties: {
-              icon,
-              label,
-              showResolvedThreads: false,
-              object: null,
-              space,
-            },
-          };
-        }
-
-        const [object] = memoizeQuery(space, { id: objectId });
-        if (!object || !subjectId) {
-          return;
-        }
-
-        const meta = resolve(getTypename(object) ?? '');
-        const label = meta.label?.(object) ||
-          object.name ||
-          meta.placeholder || ['unnamed object settings label', { ns: SPACE_PLUGIN }];
-
-        return {
-          id,
-          type,
-          data: null,
-          properties: {
-            icon,
-            label,
-            object,
-          },
-        };
-      },
-    }),
   ]);
 };

package/src/capabilities/capabilities.ts

@@ -6,7 +6,7 @@ import { defineCapability, type Label } from '@dxos/app-framework';
 import { type DeepReadonly } from '@dxos/util';
 
 import { SPACE_PLUGIN } from '../meta';
-import { type PluginState } from '../types';
+import { type ObjectForm, type PluginState } from '../types';
 
 export namespace SpaceCapabilities {
   export const State = defineCapability<DeepReadonly<PluginState>>(`${SPACE_PLUGIN}/capability/state`);
@@ -14,6 +14,8 @@ export namespace SpaceCapabilities {
 
   export type SpaceSettingsPanel = { id: string; label: Label };
   export const SettingsPanel = defineCapability<SpaceSettingsPanel>(`${SPACE_PLUGIN}/capability/settings-panel`);
+
+  export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/capability/object-form`);
 }
 
 // TODO(wittjosiah): Factor out.

package/src/capabilities/index.ts

@@ -10,6 +10,7 @@ export const IdentityCreated = lazy(() => import('./identity-created'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
+export const Schema = lazy(() => import('./schema'));
 export const SpaceSettings = lazy(() => import('./settings'));
 export const SpaceState = lazy(() => import('./state'));
 export const SpacesReady = lazy(() => import('./spaces-ready'));

package/src/capabilities/intent-resolver.ts

@@ -31,6 +31,7 @@ import {
   CREATE_OBJECT_DIALOG,
   type CreateObjectDialogProps,
   POPOVER_RENAME_OBJECT,
+  POPOVER_ADD_SPACE,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionAction, CollectionType, SpaceAction } from '../types';
@@ -212,6 +213,23 @@ export default ({ createInvitationUrl, context, observability }: IntentResolverO
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.AddSpace,
+      resolve: () => {
+        return {
+          intents: [
+            createIntent(LayoutAction.UpdatePopover, {
+              part: 'popover',
+              subject: POPOVER_ADD_SPACE,
+              options: {
+                anchorId: SpaceAction.AddSpace._tag,
+                side: 'right',
+              },
+            }),
+          ],
+        };
+      },
+    }),
     createResolver({
       intent: SpaceAction.OpenSettings,
       resolve: ({ space }) => {

package/src/capabilities/react-surface.tsx

@@ -2,19 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import React from 'react';
 
-import {
-  Capabilities,
-  contributes,
-  createSurface,
-  Surface,
-  useCapability,
-  useCapabilities,
-  usePluginManager,
-} from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface, Surface, useCapability } from '@dxos/app-framework';
 import { SettingsStore } from '@dxos/local-storage';
-import { ClientCapabilities } from '@dxos/plugin-client';
 import {
   getSpace,
   isEchoObject,
@@ -53,6 +44,8 @@ import {
   SyncStatus,
   type CreateObjectDialogProps,
   type SpaceSettingsDialogProps,
+  POPOVER_ADD_SPACE,
+  PopoverAddSpace,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionType, type SpaceSettingsProps } from '../types';
@@ -126,23 +119,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: CREATE_OBJECT_DIALOG,
       role: 'dialog',
-      filter: (data): data is { props: Partial<CreateObjectDialogProps> } => data.component === CREATE_OBJECT_DIALOG,
-      component: ({ data }) => {
-        const schemas = useCapabilities(ClientCapabilities.Schema).flat();
-        const manager = usePluginManager();
-
-        const resolve = useCallback(
-          (typename: string) => {
-            return (
-              manager.context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ??
-              {}
-            );
-          },
-          [manager],
-        );
-
-        return <CreateObjectDialog schemas={schemas} resolve={resolve} {...data.props} />;
-      },
+      filter: (data): data is { props: CreateObjectDialogProps } => data.component === CREATE_OBJECT_DIALOG,
+      component: ({ data }) => <CreateObjectDialog {...data.props} />,
     }),
     createSurface({
       id: POPOVER_RENAME_SPACE,
@@ -157,6 +135,12 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         data.component === POPOVER_RENAME_OBJECT && isReactiveObject(data.props),
       component: ({ data }) => <PopoverRenameObject object={data.props} />,
     }),
+    createSurface({
+      id: POPOVER_ADD_SPACE,
+      role: 'popover',
+      filter: (data): data is any => data.component === POPOVER_ADD_SPACE,
+      component: () => <PopoverAddSpace />,
+    }),
     createSurface({
       id: `${SPACE_PLUGIN}/navtree-presence`,
       role: 'navtree-item-end',