@dxos/plugin-space 0.7.5-main.9d26e3a → 0.7.5-main.b19bfc8

package/src/components/JoinDialog.tsx

@@ -4,12 +4,12 @@
 
 import React, { useCallback } from 'react';
 
-import { createIntent, LayoutAction, NavigationAction, useIntentDispatcher } from '@dxos/app-framework';
-import { useGraph } from '@dxos/plugin-graph';
+import { createIntent, LayoutAction, useAppGraph, useIntentDispatcher } from '@dxos/app-framework';
+import { log } from '@dxos/log';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
-import { useSpaces } from '@dxos/react-client/echo';
+import { useClient } from '@dxos/react-client';
 import { type InvitationResult } from '@dxos/react-client/invitations';
-import { Dialog, useTranslation } from '@dxos/react-ui';
+import { Dialog } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 
 import { SPACE_PLUGIN } from '../meta';
@@ -21,47 +21,55 @@ export type JoinDialogProps = JoinPanelProps & {
 };
 
 export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialogProps) => {
-  const { t } = useTranslation(SPACE_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const spaces = useSpaces();
-  const { graph } = useGraph();
+  const client = useClient();
+  const { graph } = useAppGraph();
 
   const handleDone = useCallback(
     async (result: InvitationResult | null) => {
       if (result?.spaceKey) {
         await Promise.all([
           dispatch(
-            createIntent(LayoutAction.SetLayout, {
-              element: 'toast',
+            createIntent(LayoutAction.AddToast, {
+              part: 'toast',
               subject: {
                 id: `${SPACE_PLUGIN}/join-success`,
                 duration: 5_000,
-                title: t('join success label'),
-                closeLabel: t('dismiss label'),
+                title: ['join success label', { ns: SPACE_PLUGIN }],
+                closeLabel: ['dismiss label', { ns: SPACE_PLUGIN }],
               },
             }),
           ),
           dispatch(
-            createIntent(LayoutAction.SetLayout, {
-              element: 'dialog',
-              state: false,
+            createIntent(LayoutAction.UpdateDialog, {
+              part: 'dialog',
+              options: {
+                state: false,
+              },
             }),
           ),
         ]);
       }
 
-      const space = spaces.find(({ key }) => result?.spaceKey?.equals(key));
+      const space = result?.spaceKey ? client.spaces.get(result.spaceKey) : undefined;
+      if (!space) {
+        log.warn('Space not found', result?.spaceKey);
+        return;
+      }
+
+      await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: space.id }));
+
       // TODO(wittjosiah): If navigableCollections is false and there's no target,
       //   should try to navigate to the first object of the space replicates.
       //   Potentially this could also be done on the inviters side to ensure there's always a target.
       const target = result?.target || (navigableCollections ? space?.id : undefined);
       if (target) {
-        // Wait for up to 1 second before navigating to the target node.
+        // Wait before navigating to the target node.
         // If the target has not yet replicated, this will trigger a loading toast.
         await graph.waitForPath({ target }).catch(() => {});
         await Promise.all([
-          dispatch(createIntent(NavigationAction.Open, { activeParts: { main: [target] } })),
-          dispatch(createIntent(NavigationAction.Expose, { id: target })),
+          dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [target] })),
+          dispatch(createIntent(LayoutAction.Expose, { part: 'navigation', subject: target })),
         ]);
       }
 
@@ -73,7 +81,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         );
       }
     },
-    [dispatch, spaces],
+    [dispatch, client, graph],
   );
 
   return (

package/src/components/PopoverAddSpace.tsx

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { IconButton, useTranslation } from '@dxos/react-ui';
+
+import { SPACE_PLUGIN } from '../meta';
+import { SpaceAction } from '../types';
+
+export const POPOVER_ADD_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
+
+export const PopoverAddSpace = () => {
+  const { t } = useTranslation(SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  return (
+    <div role='none' className='grid grid-cols-1 gap-1 [&>button]:justify-start'>
+      <IconButton
+        variant='ghost'
+        label={t('create space label')}
+        icon='ph--plus--regular'
+        onClick={() => {
+          void dispatch(createIntent(SpaceAction.OpenCreateSpace));
+          void dispatch(
+            createIntent(LayoutAction.UpdatePopover, { part: 'popover', options: { anchorId: '', state: false } }),
+          );
+        }}
+        data-testid='spacePlugin.createSpace'
+      />
+      <IconButton
+        variant='ghost'
+        label={t('join space label')}
+        icon='ph--sign-in--regular'
+        onClick={() => {
+          void dispatch(createIntent(SpaceAction.Join));
+          void dispatch(
+            createIntent(LayoutAction.UpdatePopover, { part: 'popover', options: { anchorId: '', state: false } }),
+          );
+        }}
+        data-testid='spacePlugin.joinSpace'
+      />
+    </div>
+  );
+};

package/src/components/SpacePluginSettings.tsx

@@ -4,25 +4,20 @@
 
 import React from 'react';
 
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { Input, useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormInput } from '@dxos/react-ui-form';
+import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
 
 import { SPACE_PLUGIN } from '../meta';
-import { SpaceAction, type SpaceSettingsProps } from '../types';
+import { type SpaceSettingsProps } from '../types';
 
 export const SpacePluginSettings = ({ settings }: { settings: SpaceSettingsProps }) => {
   const { t } = useTranslation(SPACE_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   return (
-    <>
+    <DeprecatedFormContainer>
       <DeprecatedFormInput label={t('show hidden spaces label')}>
-        <Input.Switch
-          checked={settings.showHidden}
-          onCheckedChange={(checked) => dispatch(createIntent(SpaceAction.ToggleHidden, { state: !!checked }))}
-        />
+        <Input.Switch checked={settings.showHidden} onCheckedChange={(checked) => (settings.showHidden = !!checked)} />
       </DeprecatedFormInput>
-    </>
+    </DeprecatedFormContainer>
   );
 };

package/src/components/SpacePresence.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React from 'react';
 
-import { PublicKey } from '@dxos/keys';
+import { IdentityDid, PublicKey } from '@dxos/keys';
 import { HaloSpaceMember, SpaceMember } from '@dxos/react-client/echo';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
@@ -17,7 +17,7 @@ import translations from '../translations';
 const nViewers = (n: number, currentlyAttended = true): Member[] =>
   Array.from({ length: n }, () => ({
     role: HaloSpaceMember.Role.ADMIN,
-    identity: { identityKey: PublicKey.random() },
+    identity: { did: IdentityDid.random(), identityKey: PublicKey.random() },
     presence: SpaceMember.PresenceState.ONLINE,
     lastSeen: Date.now(),
     currentlyAttended,

package/src/components/SpacePresence.tsx

@@ -4,10 +4,9 @@
 
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { usePlugin } from '@dxos/app-framework';
+import { useAppGraph, useCapability } from '@dxos/app-framework';
 import { generateName } from '@dxos/display-name';
 import { type Expando } from '@dxos/echo-schema';
-import { useGraph } from '@dxos/plugin-graph';
 import { PublicKey, useClient } from '@dxos/react-client';
 import { getSpace, useMembers, type SpaceMember, fullyQualifiedId } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
@@ -26,9 +25,10 @@ import {
 import { AttentionGlyph, useAttended, useAttention, type AttentionGlyphProps } from '@dxos/react-ui-attention';
 import { ComplexMap, keyToFallback } from '@dxos/util';
 
+import { SpaceCapabilities } from '../capabilities';
 import { usePath } from '../hooks';
 import { SPACE_PLUGIN } from '../meta';
-import type { ObjectViewerProps, SpacePluginProvides } from '../types';
+import type { ObjectViewerProps } from '../types';
 
 // TODO(thure): Get/derive these values from protocol
 const REFRESH_INTERVAL = 5000;
@@ -41,7 +41,8 @@ const noViewers = new ComplexMap<PublicKey, ObjectViewerProps>(PublicKey.hash);
 const getName = (identity: Identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 
 export const SpacePresence = ({ object, spaceKey }: { object: Expando; spaceKey?: PublicKey }) => {
-  const spacePlugin = usePlugin<SpacePluginProvides>(SPACE_PLUGIN);
+  // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
+  const spaceState = useCapability(SpaceCapabilities.MutableState);
   const client = useClient();
   const identity = useIdentity();
   const space = spaceKey ? client.spaces.get(spaceKey) : getSpace(object);
@@ -63,11 +64,10 @@ export const SpacePresence = ({ object, spaceKey }: { object: Expando; spaceKey?
 
   // TODO(thure): Could it be a smell to return early when there are interactions with `deepSignal` later, since it
   //  prevents reactivity?
-  if (!identity || !spacePlugin || !space) {
+  if (!identity || !spaceState || !space) {
     return null;
   }
 
-  const spaceState = spacePlugin.provides.space;
   const currentObjectViewers = spaceState.viewersByObject[fullyQualifiedId(object)] ?? noViewers;
 
   const membersForObject = spaceMembers
@@ -209,7 +209,7 @@ export const SmallPresenceLive = ({ id, open, viewers }: SmallPresenceLiveProps)
   // TODO(wittjosiah): If the attended node is deep in the graph and the graph is not fully loaded
   //   this will result in an empty path until the graph is connected.
   // TODO(wittjosiah): Consider using this indicator for all open nodes instead of just attended.
-  const { graph } = useGraph();
+  const { graph } = useAppGraph();
   const attended = useAttended();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);

package/src/components/SpaceSettings/SpaceSettingsDialog.tsx

@@ -2,14 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 
+import { Surface, useCapabilities } from '@dxos/app-framework';
 import { useClient } from '@dxos/react-client';
 import { Button, Clipboard, Dialog, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Tabs, type TabsRootProps, type TabsActivePart } from '@dxos/react-ui-tabs';
 import { SpacePanel, type SpacePanelProps } from '@dxos/shell/react';
 
 import { SpaceSettingsPanel, type SpaceSettingsPanelProps } from './SpaceSettingsPanel';
+import { SpaceCapabilities } from '../../capabilities';
 import { SPACE_PLUGIN } from '../../meta';
 import { COMPOSER_SPACE_LOCK, getSpaceDisplayName } from '../../util';
 
@@ -36,6 +38,8 @@ export const SpaceSettingsDialog = ({
   const [selected, setSelected] = useState<SpaceSettingsTab>(initialTab);
   const locked = space.properties[COMPOSER_SPACE_LOCK];
   const name = getSpaceDisplayName(space, { personal: client.spaces.default === space, namesCache });
+  const panels = useCapabilities(SpaceCapabilities.SettingsPanel);
+  const data = useMemo(() => ({ subject: space }), [space]);
 
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
@@ -84,6 +88,11 @@ export const SpaceSettingsDialog = ({
                 <Tabs.Tab value='members' disabled={locked}>
                   {t('members tab label')}
                 </Tabs.Tab>
+                {panels.map((panel) => (
+                  <Tabs.Tab key={panel.id} value={panel.id}>
+                    {toLocalizedString(panel.label, t)}
+                  </Tabs.Tab>
+                ))}
               </div>
             </Tabs.Tablist>
           </div>
@@ -98,6 +107,12 @@ export const SpaceSettingsDialog = ({
               <SpacePanel space={space} hideHeading target={target} createInvitationUrl={createInvitationUrl} />
             </Clipboard.Provider>
           </Tabs.Tabpanel>
+
+          {panels.map((panel) => (
+            <Tabs.Tabpanel key={panel.id} value={panel.id} classNames='pli-3 @md:pli-5 max-bs-dvh overflow-y-auto'>
+              <Surface role={`space-settings--${panel.id}`} data={data} />
+            </Tabs.Tabpanel>
+          ))}
         </Tabs.Viewport>
       </Tabs.Root>
     </Dialog.Content>

package/src/components/SpaceSettings/SpaceSettingsPanel.stories.tsx

@@ -15,7 +15,11 @@ import translations from '../../translations';
 
 const Story = (args: Partial<SpaceSettingsPanelProps>) => {
   const { space } = useClientProvider();
-  return <SpaceSettingsPanel {...args} space={space!} classNames='p-2 border border-primary-500 rounded' />;
+  return (
+    <div role='none' className='p-2 border border-primary-500 rounded'>
+      <SpaceSettingsPanel {...args} space={space!} />
+    </div>
+  );
 };
 
 const meta: Meta = {

package/src/components/SpaceSettings/SpaceSettingsPanel.tsx

@@ -8,17 +8,17 @@ import { log } from '@dxos/log';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
-import { type ThemedClassName, Input, useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormInput } from '@dxos/react-ui-form';
-import { mx } from '@dxos/react-ui-theme';
+import { Input, Toolbar, useTranslation } from '@dxos/react-ui';
+import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
+import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
 
 import { SPACE_PLUGIN } from '../../meta';
 
-export type SpaceSettingsPanelProps = ThemedClassName<{
+export type SpaceSettingsPanelProps = {
   space: Space;
-}>;
+};
 
-export const SpaceSettingsPanel = ({ classNames, space }: SpaceSettingsPanelProps) => {
+export const SpaceSettingsPanel = ({ space }: SpaceSettingsPanelProps) => {
   const { t } = useTranslation(SPACE_PLUGIN);
 
   const client = useClient();
@@ -41,7 +41,7 @@ export const SpaceSettingsPanel = ({ classNames, space }: SpaceSettingsPanelProp
   );
 
   return (
-    <div role='form' className={mx('flex flex-col', classNames)}>
+    <DeprecatedFormContainer>
       <DeprecatedFormInput label={t('name label')}>
         <Input.TextInput
           placeholder={t('unnamed space label')}
@@ -51,11 +51,33 @@ export const SpaceSettingsPanel = ({ classNames, space }: SpaceSettingsPanelProp
           }}
         />
       </DeprecatedFormInput>
+      <DeprecatedFormInput label={t('icon label')}>
+        <Toolbar.Root>
+          <IconPicker
+            value={space.properties.icon}
+            onChange={(nextIcon) => (space.properties.icon = nextIcon)}
+            onReset={() => {
+              space.properties.icon = undefined;
+            }}
+          />
+        </Toolbar.Root>
+      </DeprecatedFormInput>
+      <DeprecatedFormInput label={t('hue label')}>
+        <Toolbar.Root>
+          <HuePicker
+            value={space.properties.hue}
+            onChange={(nextHue) => (space.properties.hue = nextHue)}
+            onReset={() => {
+              space.properties.hue = undefined;
+            }}
+          />
+        </Toolbar.Root>
+      </DeprecatedFormInput>
       {edgeEnabled && (
         <DeprecatedFormInput label={t('edge replication label')}>
           <Input.Switch checked={edgeReplication} onCheckedChange={toggleEdgeReplication} />
         </DeprecatedFormInput>
       )}
-    </div>
+    </DeprecatedFormContainer>
   );
 };

package/src/components/SyncStatus/InlineSyncStatus.tsx

@@ -4,7 +4,7 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { useGraph } from '@dxos/plugin-graph';
+import { useAppGraph } from '@dxos/app-framework';
 import { QueryEdgeStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
@@ -38,7 +38,7 @@ export const InlineSyncStatus = ({ space, open }: { space: Space; open?: boolean
   // TODO(wittjosiah): If the attended node is deep in the graph and the graph is not fully loaded
   //   this will result in an empty path until the graph is connected.
   // TODO(wittjosiah): Consider using this indicator for all open nodes instead of just attended.
-  const { graph } = useGraph();
+  const { graph } = useAppGraph();
   const attended = useAttended();
   const startOfAttention = attended.at(-1);
   const path = usePath(graph, startOfAttention);

package/src/components/SyncStatus/SyncStatus.tsx

@@ -66,8 +66,9 @@ export const SyncStatusIndicator = ({ state, saved }: { state: SpaceSyncStateMap
           <StatusBar.Button title={title}>{icon}</StatusBar.Button>
         </Popover.Trigger>
         <Popover.Portal>
-          <Popover.Content sideOffset={16}>
+          <Popover.Content>
             <SyncStatusDetail state={state} summary={summary} debug={false} />
+            <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
       </Popover.Root>

package/src/components/index.ts

@@ -2,14 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './AdvancedObjectSettings';
 export * from './AwaitingObject';
+export * from './BaseObjectSettings';
 export * from './CreateDialog';
 export * from './CollectionMain';
 export * from './CollectionSection';
-export * from './DefaultObjectSettings';
 export * from './JoinDialog';
 export * from './MenuFooter';
 export * from './PersistenceStatus';
+export * from './PopoverAddSpace';
 export * from './PopoverRenameObject';
 export * from './PopoverRenameSpace';
 export * from './ShareSpaceButton';

package/src/events.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { defineEvent } from '@dxos/app-framework';
+
+import { SPACE_PLUGIN } from './meta';
+
+export namespace SpaceEvents {
+  export const SetupSettingsPanel = defineEvent(`${SPACE_PLUGIN}/event/setup-settings-panel`);
+  export const StateReady = defineEvent(`${SPACE_PLUGIN}/event/state-ready`);
+  export const DefaultSpaceReady = defineEvent(`${SPACE_PLUGIN}/event/default-space-ready`);
+}
+
+// TODO(wittjosiah): Factor out.
+export namespace ThreadEvents {
+  export const SetupThread = defineEvent(`${SPACE_PLUGIN}/event/setup-thread`);
+}

package/src/index.ts

@@ -2,14 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { SpacePlugin } from './SpacePlugin';
-
-export default SpacePlugin;
+export { SpaceCapabilities, ThreadCapabilities } from './capabilities';
+export { SpaceEvents, ThreadEvents } from './events';
 
 export * from './components';
 export * from './meta';
-export * from './types';
-export * from './util';
-export { default as translations } from './translations';
-
 export * from './SpacePlugin';
+export * from './util';

package/src/meta.ts

@@ -5,10 +5,9 @@
 import { type PluginMeta } from '@dxos/app-framework';
 
 export const SPACE_PLUGIN = 'dxos.org/plugin/space';
-export const SPACE_PLUGIN_SHORT_ID = 'space';
 
-export default {
+export const meta = {
   id: SPACE_PLUGIN,
-  shortId: SPACE_PLUGIN_SHORT_ID,
   name: 'Spaces',
+  icon: 'ph--planet--regular',
 } satisfies PluginMeta;

package/src/translations.ts

@@ -14,6 +14,7 @@ export default [
       [SPACE_PLUGIN]: {
         'plugin name': 'Spaces',
         'first run message': 'Nothing selected.',
+        'add space label': 'Create or join a space',
         'create space label': 'Create space',
         'join space label': 'Join space',
         'empty space message': 'No documents',
@@ -105,6 +106,7 @@ export default [
         'offline persisted label': 'Saved to disk (offline)',
         'remote synced label': 'Synced with peers',
         'open settings panel label': 'Show Settings',
+        'settings panel label': 'Settings',
         'open space settings label': 'Space Settings',
         'members tab label': 'Members',
         'settings tab label': 'Settings',
@@ -120,6 +122,11 @@ export default [
         'creating in collection label': 'In Collection',
         'clear input label': 'Clear',
         'expose object label': 'Expose in navtree',
+        'advanced settings label': 'Advanced',
+        'foreign keys': 'Foreign Keys',
+        'add key': 'Add Key',
+        'icon label': 'Icon',
+        'hue label': 'Color',
       },
     },
   },

package/src/types/types.ts

@@ -2,20 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import {
-  type GraphBuilderProvides,
-  type GraphSerializerProvides,
-  type IntentResolverProvides,
-  type MetadataRecordsProvides,
-  type SettingsProvides,
-  type SurfaceProvides,
-  type TranslationsProvides,
-  type Plugin,
-  ActiveParts,
-} from '@dxos/app-framework';
-import { AST, S, type TypedObject, type Expando } from '@dxos/echo-schema';
-import { type PanelProvides } from '@dxos/plugin-deck/types';
+import { type AnyIntentChain } from '@dxos/app-framework';
+import { AST, S, type Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
 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 { type ComplexMap } from '@dxos/util';
 
@@ -71,36 +61,16 @@ export type PluginState = {
   enabledEdgeReplication: boolean;
 };
 
-export type SpaceSettingsProps = {
-  /**
-   * Show closed spaces.
-   */
-  showHidden?: boolean;
-};
+export const SpaceSettingsSchema = S.mutable(
+  S.Struct({
+    /**
+     * Show closed spaces.
+     */
+    showHidden: S.Boolean,
+  }),
+);
 
-export type SchemaProvides = {
-  echo: {
-    schema?: TypedObject[];
-    system?: TypedObject[];
-  };
-};
-
-export const parseSchemaPlugin = (plugin?: Plugin) =>
-  Array.isArray((plugin?.provides as any).echo?.schema) || Array.isArray((plugin?.provides as any).echo?.system)
-    ? (plugin as Plugin<SchemaProvides>)
-    : undefined;
-
-export type SpacePluginProvides = SurfaceProvides &
-  IntentResolverProvides &
-  GraphBuilderProvides &
-  GraphSerializerProvides &
-  MetadataRecordsProvides &
-  SettingsProvides<SpaceSettingsProps> &
-  TranslationsProvides &
-  SchemaProvides &
-  PanelProvides & {
-    space: Readonly<PluginState>;
-  };
+export type SpaceSettingsProps = S.Schema.Type<typeof SpaceSettingsSchema>;
 
 // TODO(wittjosiah): Reconcile with graph export serializers.
 
@@ -123,6 +93,14 @@ export const SpaceForm = S.Struct({
   edgeReplication: S.Boolean.annotations({ [AST.TitleAnnotationId]: 'Enable EDGE Replication' }),
 });
 
+export type ObjectForm<T extends BaseObject = BaseObject> = {
+  objectSchema: TypedObject;
+  formSchema?: S.Schema<T, any>;
+  getIntent: (props: T, options: { space: Space }) => AnyIntentChain;
+};
+
+export const defineObjectForm = <T extends BaseObject>(form: ObjectForm<T>) => form;
+
 export const SPACE_ACTION = `${SPACE_PLUGIN}/action`;
 
 export namespace SpaceAction {
@@ -135,7 +113,7 @@ export namespace SpaceAction {
     input: SpaceForm,
     output: S.Struct({
       id: S.String,
-      activeParts: ActiveParts,
+      subject: S.Array(S.String),
       space: SpaceSchema,
     }),
   }) {}
@@ -177,6 +155,16 @@ export namespace SpaceAction {
     output: S.Void,
   }) {}
 
+  export class AddSpace extends S.TaggedClass<AddSpace>()(`${SPACE_ACTION}/add-space`, {
+    input: S.Void,
+    output: S.Void,
+  }) {}
+
+  export class AddSpaceMenuGroup extends S.TaggedClass<AddSpaceMenuGroup>()(`${SPACE_ACTION}/add-space-menu-group`, {
+    input: S.Void,
+    output: S.Void,
+  }) {}
+
   export class OpenSettings extends S.TaggedClass<OpenSettings>()(`${SPACE_ACTION}/open-settings`, {
     input: S.Struct({
       space: SpaceSchema,
@@ -221,7 +209,7 @@ export namespace SpaceAction {
     }),
     output: S.Struct({
       id: S.String,
-      activeParts: ActiveParts,
+      subject: S.Array(S.String),
       object: EchoObjectSchema,
     }),
   }) {}
@@ -267,13 +255,6 @@ export namespace SpaceAction {
     }),
     output: S.Void,
   }) {}
-
-  export class ToggleHidden extends S.TaggedClass<ToggleHidden>()(`${SPACE_ACTION}/toggle-hidden`, {
-    input: S.Struct({
-      state: S.optional(S.Boolean),
-    }),
-    output: S.Void,
-  }) {}
 }
 
 export namespace CollectionAction {