@dxos/plugin-space 0.7.4 → 0.7.5-main.9cb18ac

package/dist/lib/node-esm/index.mjs

@@ -1,51 +1,51 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-import {
-  CollectionAction,
-  SPACE_PLUGIN,
-  SPACE_PLUGIN_SHORT_ID,
-  SpaceAction,
-  meta_default
-} from "./chunk-UMV7XREB.mjs";
 import {
   ActorSchema,
   ChannelType,
+  CollectionAction,
   CollectionType,
   ContactType,
   MessageState,
   MessageType,
+  SPACE_ACTION,
   SPACE_DIRECTORY_HANDLE,
+  SpaceAction,
   SpaceForm,
   ThreadStatus,
   ThreadType,
   parseSchemaPlugin
-} from "./chunk-OHEAWSCA.mjs";
+} from "./chunk-CDZETPO7.mjs";
+import {
+  SPACE_PLUGIN,
+  SPACE_PLUGIN_SHORT_ID,
+  meta_default
+} from "./chunk-2MNFEB23.mjs";
 
 // packages/plugins/plugin-space/src/SpacePlugin.tsx
 import { signal } from "@preact/signals-core";
 import React21 from "react";
-import { LayoutAction as LayoutAction2, NavigationAction as NavigationAction4, Surface, filterPlugins, findPlugin, firstIdInPart, openIds, parseGraphPlugin, parseIntentPlugin as parseIntentPlugin2, parseLayoutPlugin, parseMetadataResolverPlugin, parseNavigationPlugin as parseNavigationPlugin2, resolvePlugin } from "@dxos/app-framework";
+import { LayoutAction as LayoutAction2, NavigationAction as NavigationAction5, Surface, createIntent as createIntent8, createResolver, createSurface, filterPlugins, findPlugin, firstIdInPart, openIds, parseGraphPlugin, parseIntentPlugin, parseLayoutPlugin, parseMetadataResolverPlugin, parseNavigationPlugin as parseNavigationPlugin2, resolvePlugin } from "@dxos/app-framework";
 import { EventSubscriptions } from "@dxos/async";
-import { S as S2 } from "@dxos/echo-schema";
 import { scheduledEffect } from "@dxos/echo-signals/core";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { create, isDeleted, isReactiveObject as isReactiveObject3 } from "@dxos/live-object";
+import { RefArray, create, isDeleted, isReactiveObject as isReactiveObject3, makeRef as makeRef2 } from "@dxos/live-object";
 import { LocalStorageStore } from "@dxos/local-storage";
 import { log as log3 } from "@dxos/log";
 import { Migrations as Migrations2 } from "@dxos/migrations";
 import { parseAttentionPlugin } from "@dxos/plugin-attention";
-import { parseClientPlugin } from "@dxos/plugin-client";
+import { parseClientPlugin } from "@dxos/plugin-client/types";
 import { createExtension, memoize as memoize2, toSignal } from "@dxos/plugin-graph";
-import { ObservabilityAction as ObservabilityAction2 } from "@dxos/plugin-observability/meta";
+import { ObservabilityAction as ObservabilityAction2 } from "@dxos/plugin-observability/types";
 import { EdgeReplicationSetting as EdgeReplicationSetting3 } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { PublicKey as PublicKey2 } from "@dxos/react-client";
-import { Expando, FQ_ID_LENGTH, Filter as Filter3, OBJECT_ID_LENGTH, SPACE_ID_LENGTH, SpaceState as SpaceState2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace5, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace4, loadObjectReferences, parseFullyQualifiedId, parseId } from "@dxos/react-client/echo";
+import { Expando, FQ_ID_LENGTH, Filter as Filter3, OBJECT_ID_LENGTH, QueryOptions, SPACE_ID_LENGTH, SpaceState as SpaceState2, fullyQualifiedId as fullyQualifiedId4, getSpace as getSpace5, getTypename as getTypename2, isEchoObject as isEchoObject2, isSpace as isSpace4, parseFullyQualifiedId, parseId } from "@dxos/react-client/echo";
 import { osTranslations } from "@dxos/shell/react";
 import { ComplexMap as ComplexMap2, nonNullable as nonNullable2, reduceGroupBy } from "@dxos/util";
 
 // packages/plugins/plugin-space/src/components/AwaitingObject.tsx
 import { CheckCircle, CircleDashed, CircleNotch } from "@phosphor-icons/react";
-import React, { useEffect, useState } from "react";
-import { parseIntentPlugin, useResolvePlugin, parseNavigationPlugin, NavigationAction } from "@dxos/app-framework";
+import React, { useCallback, useEffect, useState } from "react";
+import { useResolvePlugin, parseNavigationPlugin, NavigationAction, useIntentDispatcher, createIntent } from "@dxos/app-framework";
 import { useClient } from "@dxos/react-client";
 import { Filter, fullyQualifiedId, useQuery } from "@dxos/react-client/echo";
 import { Button, Toast, useTranslation } from "@dxos/react-ui";
@@ -57,7 +57,7 @@ var AwaitingObject = ({ id }) => {
   const [waiting, setWaiting] = useState(true);
   const [found, setFound] = useState(false);
   const { t } = useTranslation(SPACE_PLUGIN);
-  const intentPlugin = useResolvePlugin(parseIntentPlugin);
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
   const navigationPlugin = useResolvePlugin(parseNavigationPlugin);
   const client = useClient();
   const objects = useQuery(client.spaces, Filter.all());
@@ -82,28 +82,27 @@ var AwaitingObject = ({ id }) => {
   }, [
     id,
     objects,
-    intentPlugin
+    navigationPlugin
   ]);
-  const handleClose = async () => intentPlugin?.provides.intent.dispatch({
-    plugin: SPACE_PLUGIN,
-    action: SpaceAction.WAIT_FOR_OBJECT,
-    data: {
-      id: void 0
-    }
-  });
-  const handleNavigate = () => {
-    void intentPlugin?.provides.intent.dispatch({
-      action: NavigationAction.OPEN,
-      data: {
-        activeParts: {
-          main: [
-            id
-          ]
-        }
+  const handleClose = useCallback(async () => dispatch(createIntent(SpaceAction.WaitForObject, {
+    id: void 0
+  })), [
+    dispatch
+  ]);
+  const handleNavigate = useCallback(() => {
+    void dispatch(createIntent(NavigationAction.Open, {
+      activeParts: {
+        main: [
+          id
+        ]
       }
-    });
+    }));
     void handleClose();
-  };
+  }, [
+    id,
+    handleClose,
+    dispatch
+  ]);
   return /* @__PURE__ */ React.createElement(Toast.Root, {
     open,
     duration: TOAST_TIMEOUT,
@@ -138,14 +137,15 @@ var AwaitingObject = ({ id }) => {
 };
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx
-import React3, { useCallback as useCallback2, useRef } from "react";
-import { NavigationAction as NavigationAction2, useIntentDispatcher } from "@dxos/app-framework";
+import { pipe } from "effect";
+import React3, { useCallback as useCallback3, useRef } from "react";
+import { chain, createIntent as createIntent3, NavigationAction as NavigationAction3, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
 import { useClient as useClient2 } from "@dxos/react-client";
 import { getSpace as getSpace2, isReactiveObject as isReactiveObject2, isSpace as isSpace3, useSpaces } from "@dxos/react-client/echo";
 import { Button as Button2, Dialog, Icon as Icon2, useTranslation as useTranslation3 } from "@dxos/react-ui";
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectPanel.tsx
-import React2, { useCallback, useState as useState2 } from "react";
+import React2, { useCallback as useCallback2, useState as useState2 } from "react";
 import { getObjectAnnotation as getObjectAnnotation2, S } from "@dxos/echo-schema";
 import { isSpace as isSpace2 } from "@dxos/react-client/echo";
 import { Icon, IconButton, Input, toLocalizedString, useTranslation as useTranslation2 } from "@dxos/react-ui";
@@ -154,9 +154,10 @@ import { SearchList } from "@dxos/react-ui-searchlist";
 import { nonNullable } from "@dxos/util";
 
 // packages/plugins/plugin-space/src/util.tsx
+import { createIntent as createIntent2, NavigationAction as NavigationAction2 } from "@dxos/app-framework";
 import { EXPANDO_TYPENAME, getObjectAnnotation, getTypename } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
-import { getSchema, isReactiveObject } from "@dxos/live-object";
+import { getSchema, isReactiveObject, makeRef } from "@dxos/live-object";
 import { Migrations } from "@dxos/migrations";
 import { ACTION_GROUP_TYPE, ACTION_TYPE, cleanup, getGraph, memoize } from "@dxos/plugin-graph";
 import { Filter as Filter2, fullyQualifiedId as fullyQualifiedId2, getSpace, isEchoObject, isSpace, SpaceState } from "@dxos/react-client/echo";
@@ -200,19 +201,19 @@ var getCollectionGraphNodePartials = ({ navigable, collection, space, resolve })
     ]),
     role: "branch",
     onRearrangeChildren: (nextOrder) => {
-      collection.objects = nextOrder.filter(isEchoObject);
+      collection.objects = nextOrder.filter(isEchoObject).map(makeRef);
     },
     onTransferStart: (child, index) => {
-      if (!collection.objects.includes(child.data)) {
+      if (!collection.objects.find((object) => object.target === child.data)) {
         if (typeof index !== "undefined") {
-          collection.objects.splice(index, 0, child.data);
+          collection.objects.splice(index, 0, makeRef(child.data));
         } else {
-          collection.objects.push(child.data);
+          collection.objects.push(makeRef(child.data));
         }
       }
     },
     onTransferEnd: (child, destination) => {
-      const index = collection.objects.indexOf(child.data);
+      const index = collection.objects.findIndex((object) => object.target === child.data);
       if (index > -1) {
         collection.objects.splice(index, 1);
       }
@@ -221,9 +222,9 @@ var getCollectionGraphNodePartials = ({ navigable, collection, space, resolve })
       const newObject = await cloneObject(child.data, resolve, space);
       space.db.add(newObject);
       if (typeof index !== "undefined") {
-        collection.objects.splice(index, 0, newObject);
+        collection.objects.splice(index, 0, makeRef(newObject));
       } else {
-        collection.objects.push(newObject);
+        collection.objects.push(makeRef(newObject));
       }
     }
   };
@@ -233,7 +234,7 @@ var checkPendingMigration = (space) => {
 };
 var constructSpaceNode = ({ space, navigable = false, personal, namesCache, resolve }) => {
   const hasPendingMigration = checkPendingMigration(space);
-  const collection = space.state.get() === SpaceState.SPACE_READY && space.properties[CollectionType.typename];
+  const collection = space.state.get() === SpaceState.SPACE_READY && space.properties[CollectionType.typename]?.target;
   const partials = space.state.get() === SpaceState.SPACE_READY && collection instanceof CollectionType ? getCollectionGraphNodePartials({
     collection,
     space,
@@ -269,16 +270,12 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   const actions = [];
   if (hasPendingMigration) {
     actions.push({
-      id: getId(SpaceAction.MIGRATE),
+      id: getId(SpaceAction.Migrate._tag),
       type: ACTION_GROUP_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.MIGRATE,
-          data: {
-            space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.Migrate, {
+          space
+        }));
       },
       properties: {
         label: [
@@ -296,16 +293,12 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   if (state === SpaceState.SPACE_READY && !hasPendingMigration) {
     const locked = space.properties[COMPOSER_SPACE_LOCK];
     actions.push({
-      id: getId(SpaceAction.OPEN_CREATE_OBJECT),
+      id: getId(SpaceAction.OpenCreateObject._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.OPEN_CREATE_OBJECT,
-          data: {
-            target: space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.OpenCreateObject, {
+          target: space
+        }));
       },
       properties: {
         label: [
@@ -319,19 +312,15 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         testId: "spacePlugin.createObject"
       }
     }, {
-      id: getId(SpaceAction.SHARE),
+      id: getId(SpaceAction.Share._tag),
       type: ACTION_TYPE,
       data: async () => {
         if (locked) {
           return;
         }
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.SHARE,
-          data: {
-            space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.Share, {
+          space
+        }));
       },
       properties: {
         label: [
@@ -348,16 +337,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         }
       }
     }, {
-      id: locked ? getId(SpaceAction.UNLOCK) : getId(SpaceAction.LOCK),
+      id: locked ? getId(SpaceAction.Unlock._tag) : getId(SpaceAction.Lock._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: locked ? SpaceAction.UNLOCK : SpaceAction.LOCK,
-          data: {
+        if (locked) {
+          await dispatch(createIntent2(SpaceAction.Unlock, {
             space
-          }
-        });
+          }));
+        } else {
+          await dispatch(createIntent2(SpaceAction.Lock, {
+            space
+          }));
+        }
       },
       properties: {
         label: [
@@ -369,17 +360,13 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         icon: locked ? "ph--lock-simple-open--regular" : "ph--lock-simple--regular"
       }
     }, {
-      id: getId(SpaceAction.RENAME),
+      id: getId(SpaceAction.Rename._tag),
       type: ACTION_TYPE,
       data: async (params) => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.RENAME,
-          data: {
-            space,
-            ...params
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.Rename, {
+          space,
+          caller: params.caller
+        }));
       },
       properties: {
         label: [
@@ -395,16 +382,12 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         }
       }
     }, {
-      id: getId(SpaceAction.OPEN_SETTINGS),
+      id: getId(SpaceAction.OpenSettings._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.OPEN_SETTINGS,
-          data: {
-            space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.OpenSettings, {
+          space
+        }));
       },
       properties: {
         label: [
@@ -419,16 +402,12 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   }
   if (state !== SpaceState.SPACE_INACTIVE && !hasPendingMigration) {
     actions.push({
-      id: getId(SpaceAction.CLOSE),
+      id: getId(SpaceAction.Close._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.CLOSE,
-          data: {
-            space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.Close, {
+          space
+        }));
       },
       properties: {
         label: [
@@ -444,16 +423,12 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   }
   if (state === SpaceState.SPACE_INACTIVE) {
     actions.push({
-      id: getId(SpaceAction.OPEN),
+      id: getId(SpaceAction.Open._tag),
       type: ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.OPEN,
-          data: {
-            space
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.Open, {
+          space
+        }));
       },
       properties: {
         label: [
@@ -514,16 +489,12 @@ var constructObjectActions = ({ node, dispatch }) => {
   const actions = [
     ...object instanceof CollectionType ? [
       {
-        id: getId(SpaceAction.ADD_OBJECT),
+        id: getId(SpaceAction.OpenCreateObject._tag),
         type: ACTION_TYPE,
         data: async () => {
-          await dispatch({
-            plugin: SPACE_PLUGIN,
-            action: SpaceAction.OPEN_CREATE_OBJECT,
-            data: {
-              target: object
-            }
-          });
+          await dispatch(createIntent2(SpaceAction.OpenCreateObject, {
+            target: object
+          }));
         },
         properties: {
           label: [
@@ -539,16 +510,13 @@ var constructObjectActions = ({ node, dispatch }) => {
       }
     ] : [],
     {
-      id: getId(SpaceAction.RENAME_OBJECT),
+      id: getId(SpaceAction.RenameObject._tag),
       type: ACTION_TYPE,
       data: async (params) => {
-        await dispatch({
-          action: SpaceAction.RENAME_OBJECT,
-          data: {
-            object,
-            ...params
-          }
-        });
+        await dispatch(createIntent2(SpaceAction.RenameObject, {
+          object,
+          caller: params.caller
+        }));
       },
       properties: {
         label: [
@@ -564,24 +532,19 @@ var constructObjectActions = ({ node, dispatch }) => {
       }
     },
     {
-      id: getId(SpaceAction.REMOVE_OBJECTS),
+      id: getId(SpaceAction.RemoveObjects._tag),
       type: ACTION_TYPE,
       data: async () => {
         const graph = getGraph(node);
         const collection = graph.nodes(node, {
           relation: "inbound"
         }).find(({ data }) => data instanceof CollectionType)?.data;
-        await dispatch([
-          {
-            action: SpaceAction.REMOVE_OBJECTS,
-            data: {
-              objects: [
-                object
-              ],
-              collection
-            }
-          }
-        ]);
+        await dispatch(createIntent2(SpaceAction.RemoveObjects, {
+          objects: [
+            object
+          ],
+          target: collection
+        }));
       },
       properties: {
         label: [
@@ -612,6 +575,26 @@ var constructObjectActions = ({ node, dispatch }) => {
         icon: "ph--link--regular",
         testId: "spacePlugin.copyLink"
       }
+    },
+    // TODO(wittjosiah): Factor out and apply to all nodes.
+    {
+      id: NavigationAction2.Expose._tag,
+      type: ACTION_TYPE,
+      data: async () => {
+        await dispatch(createIntent2(NavigationAction2.Expose, {
+          id: fullyQualifiedId2(object)
+        }));
+      },
+      properties: {
+        label: [
+          "expose object label",
+          {
+            ns: SPACE_PLUGIN
+          }
+        ],
+        icon: "ph--eye--regular",
+        testId: "spacePlugin.exposeObject"
+      }
     }
   ];
   return actions;
@@ -650,7 +633,7 @@ var cloneObject = async (object, resolve, newSpace) => {
   const serializer = metadata.serializer;
   invariant(serializer, `No serializer for type: ${typename}`, {
     F: __dxlog_file,
-    L: 544,
+    L: 551,
     S: void 0,
     A: [
       "serializer",
@@ -674,9 +657,9 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
   const [target, setTarget] = useState2(initialTarget);
   const schema = schemas.find((schema2) => getObjectAnnotation2(schema2)?.typename === typename);
   const options = schemas.map(getObjectAnnotation2).filter(nonNullable);
-  const handleClearSchema = useCallback(() => setTypename(void 0), []);
-  const handleClearTarget = useCallback(() => setTarget(void 0), []);
-  const handleCreateObject = useCallback(async ({ name }) => {
+  const handleClearSchema = useCallback2(() => setTypename(void 0), []);
+  const handleClearTarget = useCallback2(() => setTarget(void 0), []);
+  const handleCreateObject = useCallback2(async ({ name }) => {
     if (!schema || !target) {
       return;
     }
@@ -692,7 +675,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
   ]);
   const schemaInput = /* @__PURE__ */ React2.createElement(SearchList.Root, {
     label: t("schema input label"),
-    classNames: "flex flex-col grow overflow-hidden my-2 px-2"
+    classNames: "flex flex-col grow overflow-hidden"
   }, /* @__PURE__ */ React2.createElement(SearchList.Input, {
     autoFocus: true,
     "data-testid": "create-object-form.schema-input",
@@ -719,7 +702,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
   }))))));
   const spaceInput = /* @__PURE__ */ React2.createElement(SearchList.Root, {
     label: t("space input label"),
-    classNames: "flex flex-col grow overflow-hidden my-2 px-2"
+    classNames: "flex flex-col grow overflow-hidden"
   }, /* @__PURE__ */ React2.createElement(SearchList.Input, {
     autoFocus: true,
     "data-testid": "create-object-form.space-input",
@@ -754,8 +737,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     role: "form",
     className: "flex flex-col gap-2"
   }, target && /* @__PURE__ */ React2.createElement("div", {
-    role: "none",
-    className: "px-2"
+    role: "none"
   }, /* @__PURE__ */ React2.createElement(Input.Root, null, /* @__PURE__ */ React2.createElement(InputHeader, null, /* @__PURE__ */ React2.createElement(Input.Label, null, t(isSpace2(target) ? "creating in space label" : "creating in collection label"))), /* @__PURE__ */ React2.createElement("div", {
     role: "none",
     className: "flex gap-2"
@@ -770,8 +752,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     label: t("clear input label"),
     onClick: handleClearTarget
   })))), schema && /* @__PURE__ */ React2.createElement("div", {
-    role: "none",
-    className: "px-2"
+    role: "none"
   }, /* @__PURE__ */ React2.createElement(Input.Root, null, /* @__PURE__ */ React2.createElement(InputHeader, null, /* @__PURE__ */ React2.createElement(Input.Label, null, t("creating object type label"))), /* @__PURE__ */ React2.createElement("div", {
     role: "none",
     className: "flex gap-2"
@@ -790,44 +771,37 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
 };
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateObjectDialog.tsx
-var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollections, resolve }) => {
+var CREATE_OBJECT_DIALOG = `${SPACE_PLUGIN}/CreateObjectDialog`;
+var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _shouldNavigate, resolve }) => {
   const closeRef = useRef(null);
   const { t } = useTranslation3(SPACE_PLUGIN);
   const client = useClient2();
   const spaces = useSpaces();
-  const dispatch = useIntentDispatcher();
-  const handleCreateObject = useCallback2(async ({ schema, target: _target, name: name2 }) => {
-    const target2 = isSpace3(_target) ? _target.properties[CollectionType.typename] : _target;
-    const createObjectAction = resolve?.(schema.typename)?.createObject;
-    if (!createObjectAction || !target2) {
+  const { dispatchPromise: dispatch } = useIntentDispatcher2();
+  const handleCreateObject = useCallback3(async ({ schema, target: _target, name: name2 }) => {
+    const target2 = isSpace3(_target) ? _target.properties[CollectionType.typename]?.target : _target;
+    const createObjectIntent = resolve?.(schema.typename)?.createObject;
+    if (!createObjectIntent || !target2) {
       return;
     }
     closeRef.current?.click();
     const space = isSpace3(target2) ? target2 : getSpace2(target2);
-    const result = await dispatch({
-      action: createObjectAction,
-      data: {
-        name: name2,
-        space
-      }
-    });
-    const object = result?.data;
+    const result = await dispatch(createObjectIntent({
+      name: name2,
+      space
+    }));
+    const object = result.data?.object;
     if (isReactiveObject2(object)) {
-      await dispatch([
-        {
-          plugin: SPACE_PLUGIN,
-          action: SpaceAction.ADD_OBJECT,
-          data: {
-            target: target2,
-            object
-          }
-        },
-        ...!(object instanceof CollectionType) || navigableCollections ? [
-          {
-            action: NavigationAction2.OPEN
-          }
-        ] : []
-      ]);
+      const addObjectIntent = createIntent3(SpaceAction.AddObject, {
+        target: target2,
+        object
+      });
+      const shouldNavigate = _shouldNavigate ?? (() => true);
+      if (shouldNavigate(object)) {
+        await dispatch(pipe(addObjectIntent, chain(NavigationAction3.Open, {})));
+      } else {
+        await dispatch(addObjectIntent);
+      }
     }
   }, [
     dispatch,
@@ -840,7 +814,7 @@ var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollection
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ React3.createElement("div", {
       role: "none",
-      className: "flex justify-between pbs-3 pis-2 pie-3 @md:pbs-4 @md:pis-4 @md:pie-5"
+      className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
     }, /* @__PURE__ */ React3.createElement(Dialog.Title, null, t("create object dialog title")), /* @__PURE__ */ React3.createElement(Dialog.Close, {
       asChild: true
     }, /* @__PURE__ */ React3.createElement(Button2, {
@@ -867,30 +841,25 @@ var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollection
 };
 
 // packages/plugins/plugin-space/src/components/CreateDialog/CreateSpaceDialog.tsx
-import React4, { useCallback as useCallback3, useRef as useRef2 } from "react";
-import { useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import React4, { useCallback as useCallback4, useRef as useRef2 } from "react";
+import { createIntent as createIntent4, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
 import { Button as Button3, Dialog as Dialog2, Icon as Icon3, useTranslation as useTranslation4 } from "@dxos/react-ui";
 import { Form as Form2 } from "@dxos/react-ui-form";
+var CREATE_SPACE_DIALOG = `${SPACE_PLUGIN}/CreateSpaceDialog`;
 var initialValues = {
   edgeReplication: true
 };
 var CreateSpaceDialog = () => {
   const closeRef = useRef2(null);
   const { t } = useTranslation4(SPACE_PLUGIN);
-  const dispatch = useIntentDispatcher2();
-  const handleCreateSpace = useCallback3(async (data) => {
-    const result = await dispatch({
-      action: SpaceAction.CREATE,
-      data
-    });
-    const target = result?.data.space;
+  const { dispatchPromise: dispatch } = useIntentDispatcher3();
+  const handleCreateSpace = useCallback4(async (data) => {
+    const result = await dispatch(createIntent4(SpaceAction.Create, data));
+    const target = result.data?.space;
     if (target) {
-      await dispatch({
-        action: SpaceAction.OPEN_CREATE_OBJECT,
-        data: {
-          target
-        }
-      });
+      await dispatch(createIntent4(SpaceAction.OpenCreateObject, {
+        target
+      }));
     }
   }, [
     dispatch
@@ -902,7 +871,7 @@ var CreateSpaceDialog = () => {
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ React4.createElement("div", {
       role: "none",
-      className: "flex justify-between pbs-3 pis-2 pie-3 @md:pbs-4 @md:pis-4 @md:pie-5"
+      className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
     }, /* @__PURE__ */ React4.createElement(Dialog2.Title, null, t("create space dialog title")), /* @__PURE__ */ React4.createElement(Dialog2.Close, {
       asChild: true
     }, /* @__PURE__ */ React4.createElement(Button3, {
@@ -970,40 +939,35 @@ var DefaultObjectSettings = ({ object }) => {
 };
 
 // packages/plugins/plugin-space/src/components/JoinDialog.tsx
-import React8, { useCallback as useCallback4 } from "react";
-import { LayoutAction, NavigationAction as NavigationAction3, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
+import React8, { useCallback as useCallback5 } from "react";
+import { createIntent as createIntent5, LayoutAction, NavigationAction as NavigationAction4, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
 import { useGraph } from "@dxos/plugin-graph";
-import { ObservabilityAction } from "@dxos/plugin-observability/meta";
+import { ObservabilityAction } from "@dxos/plugin-observability/types";
 import { useSpaces as useSpaces2 } from "@dxos/react-client/echo";
 import { Dialog as Dialog3, useTranslation as useTranslation8 } from "@dxos/react-ui";
 import { JoinPanel } from "@dxos/shell/react";
+var JOIN_DIALOG = `${SPACE_PLUGIN}/JoinDialog`;
 var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
   const { t } = useTranslation8(SPACE_PLUGIN);
-  const dispatch = useIntentDispatcher3();
+  const { dispatchPromise: dispatch } = useIntentDispatcher4();
   const spaces = useSpaces2();
   const { graph } = useGraph();
-  const handleDone = useCallback4(async (result) => {
+  const handleDone = useCallback5(async (result) => {
     if (result?.spaceKey) {
       await Promise.all([
-        dispatch({
-          action: LayoutAction.SET_LAYOUT,
-          data: {
-            element: "toast",
-            subject: {
-              id: `${SPACE_PLUGIN}/join-success`,
-              duration: 5e3,
-              title: t("join success label"),
-              closeLabel: t("dismiss label")
-            }
+        dispatch(createIntent5(LayoutAction.SetLayout, {
+          element: "toast",
+          subject: {
+            id: `${SPACE_PLUGIN}/join-success`,
+            duration: 5e3,
+            title: t("join success label"),
+            closeLabel: t("dismiss label")
           }
-        }),
-        dispatch({
-          action: LayoutAction.SET_LAYOUT,
-          data: {
-            element: "dialog",
-            state: false
-          }
-        })
+        })),
+        dispatch(createIntent5(LayoutAction.SetLayout, {
+          element: "dialog",
+          state: false
+        }))
       ]);
     }
     const space = spaces.find(({ key }) => result?.spaceKey?.equals(key));
@@ -1014,35 +978,26 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
       }).catch(() => {
       });
       await Promise.all([
-        dispatch({
-          action: NavigationAction3.OPEN,
-          data: {
-            activeParts: {
-              main: [
-                target
-              ]
-            }
+        dispatch(createIntent5(NavigationAction4.Open, {
+          activeParts: {
+            main: [
+              target
+            ]
           }
-        }),
-        dispatch({
-          action: NavigationAction3.EXPOSE,
-          data: {
-            id: target
-          }
-        })
+        })),
+        dispatch(createIntent5(NavigationAction4.Expose, {
+          id: target
+        }))
       ]);
     }
     await onDone?.(result);
     if (space) {
-      await dispatch({
-        action: ObservabilityAction.SEND_EVENT,
-        data: {
-          name: "space.join",
-          properties: {
-            spaceId: space.id
-          }
+      await dispatch(createIntent5(ObservabilityAction.SendEvent, {
+        name: "space.join",
+        properties: {
+          spaceId: space.id
         }
-      });
+      }));
     }
   }, [
     dispatch,
@@ -1140,23 +1095,22 @@ var PersistenceStatus = ({ db }) => {
         className: mx3(getSize2(4), "me-1")
       }), displayMessage && /* @__PURE__ */ React10.createElement("span", {
         className: mx3("text-sm", staticPlaceholderText)
-      }, t("persisted locally label"))), /* @__PURE__ */ React10.createElement(Tooltip.Portal, null, /* @__PURE__ */ React10.createElement(Tooltip.Content, {
-        classNames: "z-10"
-      }, t("persisted locally message"), /* @__PURE__ */ React10.createElement(Tooltip.Arrow, null))));
+      }, t("persisted locally label"))), /* @__PURE__ */ React10.createElement(Tooltip.Portal, null, /* @__PURE__ */ React10.createElement(Tooltip.Content, null, t("persisted locally message"), /* @__PURE__ */ React10.createElement(Tooltip.Arrow, null))));
   }
 };
 
 // packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx
-import React11, { useCallback as useCallback5, useRef as useRef3, useState as useState4 } from "react";
+import React11, { useCallback as useCallback6, useRef as useRef3, useState as useState4 } from "react";
 import { log } from "@dxos/log";
 import { Button as Button4, Input as Input3, Popover, useTranslation as useTranslation11 } from "@dxos/react-ui";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx";
+var POPOVER_RENAME_OBJECT = `${SPACE_PLUGIN}/PopoverRenameObject`;
 var PopoverRenameObject = ({ object: obj }) => {
   const { t } = useTranslation11(SPACE_PLUGIN);
   const doneButton = useRef3(null);
   const object = obj;
   const [name, setName] = useState4(object.name || object.title || "");
-  const handleDone = useCallback5(() => {
+  const handleDone = useCallback6(() => {
     try {
       object.name = name;
     } catch {
@@ -1167,7 +1121,7 @@ var PopoverRenameObject = ({ object: obj }) => {
           err
         }, {
           F: __dxlog_file2,
-          L: 28,
+          L: 30,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1203,13 +1157,14 @@ var PopoverRenameObject = ({ object: obj }) => {
 };
 
 // packages/plugins/plugin-space/src/components/PopoverRenameSpace.tsx
-import React12, { useCallback as useCallback6, useRef as useRef4, useState as useState5 } from "react";
+import React12, { useCallback as useCallback7, useRef as useRef4, useState as useState5 } from "react";
 import { Button as Button5, Input as Input4, Popover as Popover2, useTranslation as useTranslation12 } from "@dxos/react-ui";
+var POPOVER_RENAME_SPACE = `${SPACE_PLUGIN}/PopoverRenameSpace`;
 var PopoverRenameSpace = ({ space }) => {
   const { t } = useTranslation12(SPACE_PLUGIN);
   const doneButton = useRef4(null);
   const [name, setName] = useState5(space.properties.name ?? "");
-  const handleDone = useCallback6(() => {
+  const handleDone = useCallback7(() => {
     space.properties.name = name;
   }, [
     space,
@@ -1243,17 +1198,14 @@ var PopoverRenameSpace = ({ space }) => {
 
 // packages/plugins/plugin-space/src/components/ShareSpaceButton.tsx
 import React13 from "react";
-import { useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
+import { createIntent as createIntent6, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
 import { IconButton as IconButton2, useTranslation as useTranslation13 } from "@dxos/react-ui";
 var ShareSpaceButton = ({ space }) => {
-  const dispatch = useIntentDispatcher4();
+  const { dispatchPromise: dispatch } = useIntentDispatcher5();
   return /* @__PURE__ */ React13.createElement(ShareSpaceButtonImpl, {
-    onClick: () => dispatch({
-      action: SpaceAction.SHARE,
-      data: {
-        space
-      }
-    })
+    onClick: () => dispatch(createIntent6(SpaceAction.Share, {
+      space
+    }))
   });
 };
 var ShareSpaceButtonImpl = ({ onClick }) => {
@@ -1267,15 +1219,54 @@ var ShareSpaceButtonImpl = ({ onClick }) => {
 };
 
 // packages/plugins/plugin-space/src/components/SpacePresence.tsx
-import React14, { useCallback as useCallback7, useEffect as useEffect3, useState as useState6 } from "react";
+import React14, { useCallback as useCallback8, useEffect as useEffect4, useState as useState7 } from "react";
 import { usePlugin } from "@dxos/app-framework";
 import { generateName } from "@dxos/display-name";
+import { useGraph as useGraph2 } from "@dxos/plugin-graph";
 import { PublicKey, useClient as useClient4 } from "@dxos/react-client";
 import { getSpace as getSpace4, useMembers, fullyQualifiedId as fullyQualifiedId3 } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
 import { Avatar, AvatarGroup, AvatarGroupItem, Tooltip as Tooltip2, useTranslation as useTranslation14, List, ListItem, useDefaultValue } from "@dxos/react-ui";
-import { AttentionGlyph, useAttention } from "@dxos/react-ui-attention";
+import { AttentionGlyph, useAttended, useAttention } from "@dxos/react-ui-attention";
 import { ComplexMap, keyToFallback } from "@dxos/util";
+
+// packages/plugins/plugin-space/src/hooks/usePath.ts
+import { useEffect as useEffect3, useState as useState6 } from "react";
+var usePath = (graph, id, timeout) => {
+  const [pathState, setPathState] = useState6(id ? graph.getPath({
+    target: id
+  }) : void 0);
+  useEffect3(() => {
+    if (!id && pathState) {
+      setPathState(void 0);
+    }
+    if (pathState?.at(-1) === id || !id) {
+      return;
+    }
+    const frame = requestAnimationFrame(async () => {
+      try {
+        const path = await graph.waitForPath({
+          target: id
+        }, {
+          timeout
+        });
+        if (path) {
+          setPathState(path);
+        }
+      } catch {
+      }
+    });
+    return () => cancelAnimationFrame(frame);
+  }, [
+    graph,
+    id,
+    timeout,
+    pathState
+  ]);
+  return pathState;
+};
+
+// packages/plugins/plugin-space/src/components/SpacePresence.tsx
 var REFRESH_INTERVAL = 5e3;
 var ACTIVITY_DURATION = 3e4;
 var noViewers = new ComplexMap(PublicKey.hash);
@@ -1286,13 +1277,13 @@ var SpacePresence = ({ object, spaceKey }) => {
   const identity = useIdentity();
   const space = spaceKey ? client.spaces.get(spaceKey) : getSpace4(object);
   const spaceMembers = useMembers(space?.key);
-  const [_moment, setMoment] = useState6(Date.now());
-  useEffect3(() => {
+  const [_moment, setMoment] = useState7(Date.now());
+  useEffect4(() => {
     const interval = setInterval(() => setMoment(Date.now()), REFRESH_INTERVAL);
     return () => clearInterval(interval);
   }, []);
-  const memberOnline = useCallback7((member) => member.presence === 1, []);
-  const memberIsNotSelf = useCallback7((member) => !identity?.identityKey.equals(member.identity.identityKey), [
+  const memberOnline = useCallback8((member) => member.presence === 1, []);
+  const memberIsNotSelf = useCallback8((member) => !identity?.identityKey.equals(member.identity.identityKey), [
     identity?.identityKey
   ]);
   if (!identity || !spacePlugin || !space) {
@@ -1379,13 +1370,20 @@ var PrensenceAvatar = ({ identity, showName, match, group, index, onClick }) =>
     classNames: "text-sm truncate pli-2"
   }, getName(identity)));
 };
-var SmallPresenceLive = ({ id, viewers }) => {
+var SmallPresenceLive = ({ id, open, viewers }) => {
+  const { hasAttention, isAncestor, isRelated } = useAttention(id);
+  const isAttended = hasAttention || isAncestor || isRelated;
+  const { graph } = useGraph2();
+  const attended = useAttended();
+  const startOfAttention = attended.at(-1);
+  const path = usePath(graph, startOfAttention);
+  const containsAttended = !open && !isAttended && id && path ? path.includes(id) : false;
   const getActiveViewers = (viewers2) => {
     const moment = Date.now();
-    return Array.from(viewers2.values()).filter(({ lastSeen }) => moment - lastSeen < ACTIVITY_DURATION);
+    return Array.from(viewers2.values()).filter((viewer) => moment - viewer.lastSeen < ACTIVITY_DURATION);
   };
-  const [activeViewers, setActiveViewers] = useState6(viewers ? getActiveViewers(viewers) : []);
-  useEffect3(() => {
+  const [activeViewers, setActiveViewers] = useState7(viewers ? getActiveViewers(viewers) : []);
+  useEffect4(() => {
     if (viewers) {
       setActiveViewers(getActiveViewers(viewers));
       const interval = setInterval(() => {
@@ -1397,26 +1395,22 @@ var SmallPresenceLive = ({ id, viewers }) => {
     viewers
   ]);
   return /* @__PURE__ */ React14.createElement(SmallPresence, {
-    id,
-    count: activeViewers.length
+    count: activeViewers.length,
+    attended: isAttended,
+    containsAttended
   });
 };
-var SmallPresence = ({ id, count }) => {
+var SmallPresence = ({ count = 0, attended, containsAttended }) => {
   const { t } = useTranslation14(SPACE_PLUGIN);
-  const { hasAttention, isAncestor, isRelated } = useAttention(id);
-  const attention = hasAttention || isAncestor || isRelated;
   return /* @__PURE__ */ React14.createElement(Tooltip2.Root, null, /* @__PURE__ */ React14.createElement(Tooltip2.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ React14.createElement("div", {
-    role: "none",
-    className: "flex",
-    "data-attention": attention
   }, /* @__PURE__ */ React14.createElement(AttentionGlyph, {
+    attended,
+    containsAttended,
     presence: count > 1 ? "many" : count === 1 ? "one" : "none",
     classNames: "self-center mie-1"
-  }))), /* @__PURE__ */ React14.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React14.createElement(Tooltip2.Content, {
-    side: "bottom",
-    classNames: "z-[70]"
+  })), /* @__PURE__ */ React14.createElement(Tooltip2.Portal, null, /* @__PURE__ */ React14.createElement(Tooltip2.Content, {
+    side: "bottom"
   }, /* @__PURE__ */ React14.createElement("span", null, t("presence label", {
     count
   })), /* @__PURE__ */ React14.createElement(Tooltip2.Arrow, null))));
@@ -1424,52 +1418,49 @@ var SmallPresence = ({ id, count }) => {
 
 // packages/plugins/plugin-space/src/components/SpacePluginSettings.tsx
 import React15 from "react";
-import { useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
+import { createIntent as createIntent7, useIntentDispatcher as useIntentDispatcher6 } from "@dxos/app-framework";
 import { Input as Input5, useTranslation as useTranslation15 } from "@dxos/react-ui";
 import { DeprecatedFormInput } from "@dxos/react-ui-form";
 var SpacePluginSettings = ({ settings }) => {
   const { t } = useTranslation15(SPACE_PLUGIN);
-  const dispatch = useIntentDispatcher5();
+  const { dispatchPromise: dispatch } = useIntentDispatcher6();
   return /* @__PURE__ */ React15.createElement(React15.Fragment, null, /* @__PURE__ */ React15.createElement(DeprecatedFormInput, {
     label: t("show hidden spaces label")
   }, /* @__PURE__ */ React15.createElement(Input5.Switch, {
     checked: settings.showHidden,
-    onCheckedChange: (checked) => dispatch({
-      plugin: SPACE_PLUGIN,
-      action: SpaceAction.TOGGLE_HIDDEN,
-      data: {
-        state: !!checked
-      }
-    })
+    onCheckedChange: (checked) => dispatch(createIntent7(SpaceAction.ToggleHidden, {
+      state: !!checked
+    }))
   })));
 };
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsDialog.tsx
-import React17, { useState as useState8 } from "react";
+import React17, { useState as useState9 } from "react";
 import { useClient as useClient6 } from "@dxos/react-client";
 import { Button as Button6, Clipboard, Dialog as Dialog4, Icon as Icon4, toLocalizedString as toLocalizedString3, useTranslation as useTranslation17 } from "@dxos/react-ui";
 import { Tabs } from "@dxos/react-ui-tabs";
 import { SpacePanel } from "@dxos/shell/react";
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx
-import React16, { useCallback as useCallback8, useState as useState7 } from "react";
+import React16, { useCallback as useCallback9, useState as useState8 } from "react";
 import { log as log2 } from "@dxos/log";
 import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { useClient as useClient5 } from "@dxos/react-client";
 import { Input as Input6, useTranslation as useTranslation16 } from "@dxos/react-ui";
 import { DeprecatedFormInput as DeprecatedFormInput2 } from "@dxos/react-ui-form";
+import { mx as mx4 } from "@dxos/react-ui-theme";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx";
-var SpaceSettingsPanel = ({ space }) => {
+var SpaceSettingsPanel = ({ classNames, space }) => {
   const { t } = useTranslation16(SPACE_PLUGIN);
   const client = useClient5();
   const edgeEnabled = Boolean(client.config.values.runtime?.client?.edgeFeatures?.echoReplicator);
-  const [edgeReplication, setEdgeReplication] = useState7(space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED);
-  const toggleEdgeReplication = useCallback8(async (next) => {
+  const [edgeReplication, setEdgeReplication] = useState8(space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED);
+  const toggleEdgeReplication = useCallback9(async (next) => {
     setEdgeReplication(next);
     await space?.internal.setEdgeReplicationPreference(next ? EdgeReplicationSetting.ENABLED : EdgeReplicationSetting.DISABLED).catch((err) => {
       log2.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 35,
+        L: 36,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1480,7 +1471,7 @@ var SpaceSettingsPanel = ({ space }) => {
   ]);
   return /* @__PURE__ */ React16.createElement("div", {
     role: "form",
-    className: "flex flex-col"
+    className: mx4("flex flex-col", classNames)
   }, /* @__PURE__ */ React16.createElement(DeprecatedFormInput2, {
     label: t("name label")
   }, /* @__PURE__ */ React16.createElement(Input6.TextInput, {
@@ -1498,11 +1489,12 @@ var SpaceSettingsPanel = ({ space }) => {
 };
 
 // packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsDialog.tsx
+var SPACE_SETTINGS_DIALOG = `${SPACE_PLUGIN}/SpaceSettingsDialog`;
 var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "members", namesCache }) => {
   const { t } = useTranslation17(SPACE_PLUGIN);
   const client = useClient6();
-  const [tabsActivePart, setTabsActivePart] = useState8("list");
-  const [selected, setSelected] = useState8(initialTab);
+  const [tabsActivePart, setTabsActivePart] = useState9("list");
+  const [selected, setSelected] = useState9(initialTab);
   const locked = space.properties[COMPOSER_SPACE_LOCK];
   const name = getSpaceDisplayName(space, {
     personal: client.spaces.default === space,
@@ -1515,7 +1507,7 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ React17.createElement("div", {
       role: "none",
-      className: "flex justify-between pbs-3 pis-2 pie-3 @md:pbs-4 @md:pis-4 @md:pie-5"
+      className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
     }, /* @__PURE__ */ React17.createElement(Dialog4.Title, {
       onClick: () => setTabsActivePart("list"),
       "aria-description": t("click to return to tablist description"),
@@ -1578,14 +1570,16 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/InlineSyncStatus.tsx
-import React18, { useEffect as useEffect5, useMemo, useState as useState10 } from "react";
+import React18, { useEffect as useEffect6, useState as useState11 } from "react";
+import { useGraph as useGraph3 } from "@dxos/plugin-graph";
 import { QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { useClient as useClient8 } from "@dxos/react-client";
-import { Icon as Icon5, useTranslation as useTranslation18 } from "@dxos/react-ui";
+import { Tooltip as Tooltip3, useTranslation as useTranslation18 } from "@dxos/react-ui";
+import { AttentionGlyph as AttentionGlyph2, useAttended as useAttended2, useAttention as useAttention2 } from "@dxos/react-ui-attention";
 
 // packages/plugins/plugin-space/src/components/SyncStatus/sync-state.ts
-import { useEffect as useEffect4, useState as useState9 } from "react";
+import { useEffect as useEffect5, useState as useState10 } from "react";
 import { Context } from "@dxos/context";
 import { EdgeService } from "@dxos/protocols";
 import { useClient as useClient7 } from "@dxos/react-client";
@@ -1610,8 +1604,8 @@ var getSyncSummary = (syncMap) => {
 var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(`${EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
 var useSyncState = () => {
   const client = useClient7();
-  const [spaceState, setSpaceState] = useState9({});
-  useEffect4(() => {
+  const [spaceState, setSpaceState] = useState10({});
+  useEffect5(() => {
     const ctx = new Context(void 0, {
       F: __dxlog_file4,
       L: 48
@@ -1645,8 +1639,8 @@ var useSyncState = () => {
   return spaceState;
 };
 var useSpaceSyncState = (space) => {
-  const [spaceState, setSpaceState] = useState9();
-  useEffect4(() => {
+  const [spaceState, setSpaceState] = useState10();
+  useEffect5(() => {
     const ctx = new Context(void 0, {
       F: __dxlog_file4,
       L: 87
@@ -1668,9 +1662,9 @@ var useSpaceSyncState = (space) => {
 
 // packages/plugins/plugin-space/src/components/SyncStatus/InlineSyncStatus.tsx
 var useEdgeStatus = () => {
-  const [status, setStatus] = useState10(QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED);
+  const [status, setStatus] = useState11(QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED);
   const client = useClient8();
-  useEffect5(() => {
+  useEffect6(() => {
     client.services.services.EdgeAgentService?.queryEdgeStatus().subscribe(({ status: status2 }) => {
       setStatus(status2);
     });
@@ -1679,47 +1673,47 @@ var useEdgeStatus = () => {
   ]);
   return status;
 };
-var InlineSyncStatus = ({ space }) => {
+var InlineSyncStatus = ({ space, open }) => {
+  const { t } = useTranslation18(SPACE_PLUGIN);
+  const id = space.id;
+  const { hasAttention, isAncestor, isRelated } = useAttention2(id);
+  const isAttended = hasAttention || isAncestor || isRelated;
+  const { graph } = useGraph3();
+  const attended = useAttended2();
+  const startOfAttention = attended.at(-1);
+  const path = usePath(graph, startOfAttention);
+  const containsAttended = !open && !isAttended && id && path ? path.includes(id) : false;
   const connectedToEdge = useEdgeStatus() === QueryEdgeStatusResponse.EdgeStatus.CONNECTED;
   const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting2.ENABLED;
   const syncState = useSpaceSyncState(space);
-  if (!connectedToEdge || !edgeSyncEnabled || !syncState || syncState.missingOnLocal === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ React18.createElement(InlineSyncStatusIndicator, null);
-};
-var InlineSyncStatusIndicator = () => {
-  const { t } = useTranslation18(SPACE_PLUGIN);
-  const animationProps = useMemo(() => ({
-    // Synchronize animations.
-    animationDelay: `-${Date.now() % 2e3}ms`
-  }), []);
-  return /* @__PURE__ */ React18.createElement("div", {
-    role: "status",
-    "aria-label": t("syncing message"),
-    className: "flex items-center"
-  }, /* @__PURE__ */ React18.createElement(Icon5, {
-    icon: "ph--circle-notch--regular",
-    size: 3,
-    style: animationProps,
-    classNames: "text-subdued animate-[spin_2s_linear_infinite]"
-  }));
+  const syncing = connectedToEdge && edgeSyncEnabled && syncState && syncState.missingOnLocal > 0;
+  return /* @__PURE__ */ React18.createElement(Tooltip3.Root, null, /* @__PURE__ */ React18.createElement(Tooltip3.Trigger, {
+    asChild: true
+  }, /* @__PURE__ */ React18.createElement(AttentionGlyph2, {
+    syncing,
+    attended: isAttended,
+    containsAttended,
+    classNames: "self-center mie-1"
+  })), /* @__PURE__ */ React18.createElement(Tooltip3.Portal, null, /* @__PURE__ */ React18.createElement(Tooltip3.Content, {
+    side: "bottom",
+    classNames: "z-[70]"
+  }, /* @__PURE__ */ React18.createElement("span", null, t("syncing label")), /* @__PURE__ */ React18.createElement(Tooltip3.Arrow, null))));
 };
 
 // packages/plugins/plugin-space/src/components/SyncStatus/SyncStatus.tsx
-import React20, { useCallback as useCallback9, useEffect as useEffect7, useState as useState12 } from "react";
+import React20, { useCallback as useCallback10, useEffect as useEffect8, useState as useState13 } from "react";
 import { StatusBar } from "@dxos/plugin-status-bar";
 import { useClient as useClient10 } from "@dxos/react-client";
-import { Icon as Icon7, Input as Input7, Popover as Popover3, useTranslation as useTranslation20 } from "@dxos/react-ui";
+import { Icon as Icon6, Input as Input7, Popover as Popover3, useTranslation as useTranslation20 } from "@dxos/react-ui";
 import { SyntaxHighlighter } from "@dxos/react-ui-syntax-highlighter";
-import { mx as mx5 } from "@dxos/react-ui-theme";
+import { mx as mx6 } from "@dxos/react-ui-theme";
 
 // packages/plugins/plugin-space/src/components/SyncStatus/Space.tsx
-import React19, { useEffect as useEffect6, useState as useState11 } from "react";
+import React19, { useEffect as useEffect7, useState as useState12 } from "react";
 import { useClient as useClient9 } from "@dxos/react-client";
 import { useSpace } from "@dxos/react-client/echo";
-import { Icon as Icon6, toLocalizedString as toLocalizedString4, useTranslation as useTranslation19 } from "@dxos/react-ui";
-import { mx as mx4 } from "@dxos/react-ui-theme";
+import { Icon as Icon5, toLocalizedString as toLocalizedString4, useTranslation as useTranslation19 } from "@dxos/react-ui";
+import { mx as mx5 } from "@dxos/react-ui-theme";
 var SYNC_STALLED_TIMEOUT = 5e3;
 var styles = {
   barBg: "bg-neutral-50 dark:bg-green-900 text-black",
@@ -1727,9 +1721,9 @@ var styles = {
   barHover: "dark:hover:bg-green-500"
 };
 var useActive = (count) => {
-  const [current, setCurrent] = useState11(count);
-  const [active, setActive] = useState11(false);
-  useEffect6(() => {
+  const [current, setCurrent] = useState12(count);
+  const [active, setActive] = useState12(false);
+  useEffect7(() => {
     let t;
     if (count !== current) {
       setActive(true);
@@ -1776,10 +1770,10 @@ var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumen
     }
   }, /* @__PURE__ */ React19.createElement("span", {
     className: "is-1/2 truncate"
-  }, spaceName), /* @__PURE__ */ React19.createElement(Icon6, {
+  }, spaceName), /* @__PURE__ */ React19.createElement(Icon5, {
     icon: "ph--arrow-fat-line-left--regular",
     size: 3,
-    classNames: mx4(downActive && "animate-[pulse_1s_infinite]")
+    classNames: mx5(downActive && "animate-[pulse_1s_infinite]")
   }), /* @__PURE__ */ React19.createElement(Candle, {
     up: {
       count: remoteDocumentCount,
@@ -1790,22 +1784,22 @@ var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumen
       total: localDocumentCount + missingOnLocal
     },
     title: spaceId
-  }), /* @__PURE__ */ React19.createElement(Icon6, {
+  }), /* @__PURE__ */ React19.createElement(Icon5, {
     icon: "ph--arrow-fat-line-right--regular",
     size: 3,
-    classNames: mx4(upActive && "animate-[pulse_1s_step-start_infinite]")
+    classNames: mx5(upActive && "animate-[pulse_1s_step-start_infinite]")
   }));
 };
 var Candle = ({ classNames, up, down }) => {
   return /* @__PURE__ */ React19.createElement("div", {
-    className: mx4("grid grid-cols-[1fr_2rem_1fr] w-full h-3", classNames)
+    className: mx5("grid grid-cols-[1fr_2rem_1fr] w-full h-3", classNames)
   }, /* @__PURE__ */ React19.createElement(Bar, {
     classNames: "justify-end",
     ...up
   }), /* @__PURE__ */ React19.createElement("div", {
     className: "relative"
   }, /* @__PURE__ */ React19.createElement("div", {
-    className: mx4("absolute inset-0 flex items-center justify-center text-xs", styles.barBg)
+    className: mx5("absolute inset-0 flex items-center justify-center text-xs", styles.barBg)
   }, up.total)), /* @__PURE__ */ React19.createElement(Bar, down));
 };
 var Bar = ({ classNames, count, total }) => {
@@ -1814,9 +1808,9 @@ var Bar = ({ classNames, count, total }) => {
     p = Math.min(p, 95);
   }
   return /* @__PURE__ */ React19.createElement("div", {
-    className: mx4("relative flex w-full", styles.barBg, classNames)
+    className: mx5("relative flex w-full", styles.barBg, classNames)
   }, /* @__PURE__ */ React19.createElement("div", {
-    className: mx4("shrink-0", styles.barFg),
+    className: mx5("shrink-0", styles.barFg),
     style: {
       width: `${p}%`
     }
@@ -1920,8 +1914,8 @@ var getIcon = (status) => {
 var SyncStatus = () => {
   const client = useClient10();
   const state = useSyncState();
-  const [saved, setSaved] = useState12(true);
-  useEffect7(() => {
+  const [saved, setSaved] = useState13(true);
+  useEffect8(() => {
     return createClientSaveTracker(client, (state2) => {
       setSaved(state2 === "saved");
     });
@@ -1943,8 +1937,8 @@ var SyncStatusIndicator = ({ state, saved }) => {
     needsToUpload,
     needsToDownload
   });
-  const [classNames, setClassNames] = useState12();
-  useEffect7(() => {
+  const [classNames, setClassNames] = useState13();
+  useEffect8(() => {
     setClassNames(void 0);
     if (offline || !needsToUpload && !needsToDownload) {
       return;
@@ -1959,7 +1953,7 @@ var SyncStatusIndicator = ({ state, saved }) => {
     needsToDownload
   ]);
   const title = t(`${status} label`);
-  const icon = /* @__PURE__ */ React20.createElement(Icon7, {
+  const icon = /* @__PURE__ */ React20.createElement(Icon6, {
     icon: getIcon(status),
     size: 4,
     classNames
@@ -1983,14 +1977,14 @@ var SyncStatusIndicator = ({ state, saved }) => {
   }
 };
 var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
-  const [showAll, setShowAll] = useState12(false);
+  const [showAll, setShowAll] = useState13(false);
   const { t } = useTranslation20(SPACE_PLUGIN);
   const entries = Object.entries(state).filter(([_, value]) => showAll || value.missingOnLocal + value.missingOnRemote > 0).toSorted(([a], [b]) => a < b ? -1 : a > b ? 1 : 0);
-  const handleCheckedChange = useCallback9((state2) => setShowAll(state2), [
+  const handleCheckedChange = useCallback10((state2) => setShowAll(state2), [
     setShowAll
   ]);
   return /* @__PURE__ */ React20.createElement("div", {
-    className: mx5("flex flex-col gap-3 p-2 text-xs min-w-96", classNames)
+    className: mx6("flex flex-col gap-3 p-2 text-xs min-w-96", classNames)
   }, /* @__PURE__ */ React20.createElement("div", {
     role: "none",
     className: "flex items-center"
@@ -2118,7 +2112,7 @@ var translations_default = [
         "open space settings label": "Space Settings",
         "members tab label": "Members",
         "settings tab label": "Settings",
-        "syncing message": "Space syncing",
+        "syncing label": "Space syncing",
         "show all label": "Show all",
         "no sync status label": "No space with missing objects.",
         "create space dialog title": "Create Space",
@@ -2126,9 +2120,10 @@ var translations_default = [
         "space input placeholder": "Select space",
         "schema input placeholder": "Select object type",
         "creating object type label": "Type",
-        "creating in space label": "In Space",
+        "creating in space label": "Location",
         "creating in collection label": "In Collection",
-        "clear input label": "Clear"
+        "clear input label": "Clear",
+        "expose object label": "Expose in navtree"
       }
     }
   }
@@ -2163,7 +2158,6 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
   let layoutPlugin;
   let navigationPlugin;
   let attentionPlugin;
-  let metadataPlugin;
   const createSpaceInvitationUrl = (invitationCode) => {
     const baseUrl = new URL(invitationUrl);
     baseUrl.searchParams.set(invitationParam, invitationCode);
@@ -2204,13 +2198,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
         const timeout = setTimeout(async () => {
           const node2 = graph.findNode(soloPart.id);
           if (!node2) {
-            await dispatch({
-              plugin: SPACE_PLUGIN,
-              action: SpaceAction.WAIT_FOR_OBJECT,
-              data: {
-                id: soloPart.id
-              }
-            });
+            await dispatch(createIntent8(SpaceAction.WaitForObject, {
+              id: soloPart.id
+            }));
           }
         }, WAIT_FOR_OBJECT_TIMEOUT2);
         return () => clearTimeout(timeout);
@@ -2279,7 +2269,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 err: err.message
               }, {
                 F: __dxlog_file6,
-                L: 320,
+                L: 324,
                 S: void 0,
                 C: (f, a) => f(...a)
               });
@@ -2332,7 +2322,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
     } catch (err) {
       log3.catch(err, void 0, {
         F: __dxlog_file6,
-        L: 389,
+        L: 393,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -2340,7 +2330,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
   };
   return {
     meta: meta_default,
-    ready: async (plugins) => {
+    ready: async ({ plugins }) => {
       settings.prop({
         key: "showHidden",
         type: LocalStorageStore.bool({
@@ -2359,16 +2349,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       }
       graphPlugin = resolvePlugin(plugins, parseGraphPlugin);
       layoutPlugin = resolvePlugin(plugins, parseLayoutPlugin);
-      metadataPlugin = resolvePlugin(plugins, parseMetadataResolverPlugin);
       navigationPlugin = resolvePlugin(plugins, parseNavigationPlugin2);
       attentionPlugin = resolvePlugin(plugins, parseAttentionPlugin);
       clientPlugin = resolvePlugin(plugins, parseClientPlugin);
-      intentPlugin = resolvePlugin(plugins, parseIntentPlugin2);
+      intentPlugin = resolvePlugin(plugins, parseIntentPlugin);
       if (!clientPlugin || !intentPlugin) {
         return;
       }
       const client = clientPlugin.provides.client;
-      const dispatch = intentPlugin.provides.intent.dispatch;
+      const dispatch = intentPlugin.provides.intent.dispatchPromise;
       schemas.push(...filterPlugins(plugins, parseSchemaPlugin).map((plugin) => plugin.provides.echo.schema).filter(nonNullable2).reduce((acc, schema) => {
         return [
           ...acc,
@@ -2383,10 +2372,10 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       });
       const handleFirstRun = async () => {
         const defaultSpace = client.spaces.default;
-        defaultSpace.properties[CollectionType.typename] = create(CollectionType, {
+        defaultSpace.properties[CollectionType.typename] = makeRef2(create(CollectionType, {
           objects: [],
           views: {}
-        });
+        }));
         if (Migrations2.versionProperty) {
           defaultSpace.properties[Migrations2.versionProperty] = Migrations2.targetVersion;
         }
@@ -2442,7 +2431,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       metadata: {
         records: {
           [CollectionType.typename]: {
-            createObject: CollectionAction.CREATE,
+            createObject: (props) => createIntent8(CollectionAction.Create, props),
             placeholder: [
               "unnamed collection label",
               {
@@ -2451,9 +2440,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             ],
             icon: "ph--cards-three--regular",
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (collection) => loadObjectReferences(collection, (collection2) => [
-              ...collection2.objects,
-              ...Object.values(collection2.views)
+            loadReferences: async (collection) => await RefArray.loadAll([
+              ...collection.objects,
+              ...Object.values(collection.views)
             ])
           }
         }
@@ -2464,125 +2453,203 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
         ]
       },
       surface: {
-        component: ({ data, role, ...rest }) => {
-          switch (role) {
-            case "article":
-              return isSpace4(data.object) && data.object.state.get() === SpaceState2.SPACE_READY ? /* @__PURE__ */ React21.createElement(Surface, {
+        definitions: ({ plugins }) => {
+          const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
+          const attention = resolvePlugin(plugins, parseAttentionPlugin)?.provides.attention;
+          invariant2(resolve, "Metadata plugin not found.", {
+            F: __dxlog_file6,
+            L: 503,
+            S: void 0,
+            A: [
+              "resolve",
+              "'Metadata plugin not found.'"
+            ]
+          });
+          invariant2(attention, "Attention plugin not found.", {
+            F: __dxlog_file6,
+            L: 504,
+            S: void 0,
+            A: [
+              "attention",
+              "'Attention plugin not found.'"
+            ]
+          });
+          return [
+            createSurface({
+              id: `${SPACE_PLUGIN}/article`,
+              role: "article",
+              filter: (data) => (
+                // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
+                isSpace4(data.subject) && data.subject.state.get() === SpaceState2.SPACE_READY
+              ),
+              component: ({ data, role, ...rest }) => /* @__PURE__ */ React21.createElement(Surface, {
                 data: {
-                  object: data.object.properties[CollectionType.typename],
-                  id: data.object.id
+                  id: data.subject.id,
+                  subject: data.subject.properties[CollectionType.typename]?.target
                 },
                 role,
                 ...rest
-              }) : data.object instanceof CollectionType ? {
-                node: /* @__PURE__ */ React21.createElement(CollectionMain, {
-                  collection: data.object
-                }),
-                disposition: "fallback"
-              } : null;
-            // TODO(burdon): Add role name syntax to minimal plugin docs.
-            case "complementary--settings":
-              return isSpace4(data.subject) ? /* @__PURE__ */ React21.createElement(SpaceSettingsPanel, {
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/collection-fallback`,
+              role: "article",
+              disposition: "fallback",
+              filter: (data) => data.subject instanceof CollectionType,
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(CollectionMain, {
+                collection: data.subject
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/settings-panel`,
+              // TODO(burdon): Add role name syntax to minimal plugin docs.
+              role: "complementary--settings",
+              filter: (data) => isSpace4(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(SpaceSettingsPanel, {
                 space: data.subject
-              }) : isEchoObject2(data.subject) ? {
-                node: /* @__PURE__ */ React21.createElement(DefaultObjectSettings, {
-                  object: data.subject
-                }),
-                disposition: "fallback"
-              } : null;
-            case "dialog":
-              if (data.component === "dxos.org/plugin/space/SpaceSettingsDialog") {
-                return /* @__PURE__ */ React21.createElement(SpaceSettingsDialog, {
-                  ...data.subject,
-                  createInvitationUrl: createSpaceInvitationUrl
-                });
-              } else if (data.component === "dxos.org/plugin/space/JoinDialog") {
-                return /* @__PURE__ */ React21.createElement(JoinDialog, data.subject);
-              } else if (data.component === "dxos.org/plugin/space/CreateSpaceDialog") {
-                return /* @__PURE__ */ React21.createElement(CreateSpaceDialog, null);
-              } else if (data.component === "dxos.org/plugin/space/CreateObjectDialog") {
-                return /* @__PURE__ */ React21.createElement(CreateObjectDialog, {
-                  ...data.subject,
-                  schemas,
-                  navigableCollections: state.values.navigableCollections,
-                  resolve: metadataPlugin?.provides.metadata.resolver
-                });
-              }
-              return null;
-            case "popover": {
-              if (data.component === "dxos.org/plugin/space/RenameSpacePopover" && isSpace4(data.subject)) {
-                return /* @__PURE__ */ React21.createElement(PopoverRenameSpace, {
-                  space: data.subject
-                });
-              }
-              if (data.component === "dxos.org/plugin/space/RenameObjectPopover" && isReactiveObject3(data.subject)) {
-                return /* @__PURE__ */ React21.createElement(PopoverRenameObject, {
-                  object: data.subject
-                });
-              }
-              return null;
-            }
-            case "navtree-item-end": {
-              return isReactiveObject3(data.object) ? /* @__PURE__ */ React21.createElement(SmallPresenceLive, {
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/object-settings-panel-fallback`,
+              role: "complementary--settings",
+              disposition: "fallback",
+              filter: (data) => isEchoObject2(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(DefaultObjectSettings, {
+                object: data.subject
+              })
+            }),
+            createSurface({
+              id: SPACE_SETTINGS_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === SPACE_SETTINGS_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(SpaceSettingsDialog, {
+                ...data.subject,
+                createInvitationUrl: createSpaceInvitationUrl
+              })
+            }),
+            createSurface({
+              id: JOIN_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === JOIN_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(JoinDialog, data.subject)
+            }),
+            createSurface({
+              id: CREATE_SPACE_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === CREATE_SPACE_DIALOG,
+              component: () => /* @__PURE__ */ React21.createElement(CreateSpaceDialog, null)
+            }),
+            createSurface({
+              id: CREATE_OBJECT_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === CREATE_OBJECT_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(CreateObjectDialog, {
+                schemas,
+                resolve,
+                ...data.subject
+              })
+            }),
+            createSurface({
+              id: POPOVER_RENAME_SPACE,
+              role: "popover",
+              filter: (data) => data.component === POPOVER_RENAME_SPACE && isSpace4(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(PopoverRenameSpace, {
+                space: data.subject
+              })
+            }),
+            createSurface({
+              id: POPOVER_RENAME_OBJECT,
+              role: "popover",
+              filter: (data) => data.component === POPOVER_RENAME_OBJECT && isReactiveObject3(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(PopoverRenameObject, {
+                object: data.subject
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/navtree-presence`,
+              role: "navtree-item-end",
+              filter: (data) => typeof data.id === "string" && isEchoObject2(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(SmallPresenceLive, {
                 id: data.id,
-                viewers: state.values.viewersByObject[fullyQualifiedId4(data.object)]
-              }) : isSpace4(data.object) ? /* @__PURE__ */ React21.createElement(InlineSyncStatus, {
-                space: data.object
-              }) : (
-                // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
-                /* @__PURE__ */ React21.createElement(SmallPresence, {
-                  id: data.id,
-                  count: 0
-                })
-              );
-            }
-            case "navbar-end": {
-              if (!isEchoObject2(data.object) && !isSpace4(data.object)) {
-                return null;
-              }
-              const space = isSpace4(data.object) ? data.object : getSpace5(data.object);
-              const object = isSpace4(data.object) ? data.object.state.get() === SpaceState2.SPACE_READY ? space?.properties[CollectionType.typename] : void 0 : data.object;
-              return space && object ? {
-                node: /* @__PURE__ */ React21.createElement(React21.Fragment, null, /* @__PURE__ */ React21.createElement(SpacePresence, {
+                open: data.open,
+                viewers: state.values.viewersByObject[data.id]
+              })
+            }),
+            createSurface({
+              // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
+              id: `${SPACE_PLUGIN}/navtree-presence-fallback`,
+              role: "navtree-item-end",
+              disposition: "fallback",
+              filter: (data) => typeof data.id === "string",
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(SmallPresenceLive, {
+                id: data.id,
+                open: data.open
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/navtree-sync-status`,
+              role: "navtree-item-end",
+              filter: (data) => isSpace4(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(InlineSyncStatus, {
+                space: data.subject,
+                open: data.open
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/navbar-presence`,
+              role: "navbar-end",
+              disposition: "hoist",
+              filter: (data) => isSpace4(data.subject) || isEchoObject2(data.subject),
+              component: ({ data }) => {
+                const space = isSpace4(data.subject) ? data.subject : getSpace5(data.subject);
+                const object = isSpace4(data.subject) ? data.subject.state.get() === SpaceState2.SPACE_READY ? space?.properties[CollectionType.typename]?.target : void 0 : data.subject;
+                return space && object ? /* @__PURE__ */ React21.createElement(React21.Fragment, null, /* @__PURE__ */ React21.createElement(SpacePresence, {
                   object
                 }), space.properties[COMPOSER_SPACE_LOCK] ? null : /* @__PURE__ */ React21.createElement(ShareSpaceButton, {
                   space
-                })),
-                disposition: "hoist"
-              } : null;
-            }
-            case "section":
-              return data.object instanceof CollectionType ? /* @__PURE__ */ React21.createElement(CollectionSection, {
-                collection: data.object
-              }) : null;
-            case "settings":
-              return data.plugin === meta_default.id ? /* @__PURE__ */ React21.createElement(SpacePluginSettings, {
-                settings: settings.values
-              }) : null;
-            case "menu-footer":
-              if (isEchoObject2(data.object)) {
-                return /* @__PURE__ */ React21.createElement(MenuFooter, {
-                  object: data.object
-                });
-              } else {
-                return null;
+                })) : null;
               }
-            case "status": {
-              return /* @__PURE__ */ React21.createElement(SyncStatus, null);
-            }
-            default:
-              return null;
-          }
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/collection-section`,
+              role: "section",
+              filter: (data) => data.subject instanceof CollectionType,
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(CollectionSection, {
+                collection: data.subject
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/settings`,
+              role: "settings",
+              filter: (data) => data.subject === SPACE_PLUGIN,
+              component: () => /* @__PURE__ */ React21.createElement(SpacePluginSettings, {
+                settings: settings.values
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/menu-footer`,
+              role: "menu-footer",
+              filter: (data) => isEchoObject2(data.subject),
+              component: ({ data }) => /* @__PURE__ */ React21.createElement(MenuFooter, {
+                object: data.subject
+              })
+            }),
+            createSurface({
+              id: `${SPACE_PLUGIN}/status`,
+              role: "status",
+              component: () => /* @__PURE__ */ React21.createElement(SyncStatus, null)
+            })
+          ];
         }
       },
       graph: {
         builder: (plugins) => {
           const clientPlugin2 = resolvePlugin(plugins, parseClientPlugin);
-          const metadataPlugin2 = resolvePlugin(plugins, parseMetadataResolverPlugin);
+          const metadataPlugin = resolvePlugin(plugins, parseMetadataResolverPlugin);
           const graphPlugin2 = resolvePlugin(plugins, parseGraphPlugin);
           const client = clientPlugin2?.provides.client;
-          const dispatch = intentPlugin?.provides.intent.dispatch;
-          const resolve = metadataPlugin2?.provides.metadata.resolver;
+          const dispatch = intentPlugin?.provides.intent.dispatchPromise;
+          const resolve = metadataPlugin?.provides.metadata.resolver;
           const graph = graphPlugin2?.provides.graph;
           if (!client || !dispatch || !resolve || !graph) {
             return [];
@@ -2615,7 +2682,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 } else {
                   log3.warn("spaces order object not found", void 0, {
                     F: __dxlog_file6,
-                    L: 649,
+                    L: 694,
                     S: void 0,
                     C: (f, a) => f(...a)
                   });
@@ -2624,27 +2691,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }
           };
           return [
-            // Create spaces group node.
+            // Primary actions.
             createExtension({
-              id: `${SPACE_PLUGIN}/root`,
+              id: `${SPACE_PLUGIN}/primary-actions`,
               filter: (node) => node.id === "root",
-              connector: () => [
-                spacesNode
-              ],
-              resolver: ({ id }) => id === SPACES ? spacesNode : void 0
-            }),
-            // Create space nodes.
-            createExtension({
-              id: SPACES,
-              filter: (node) => node.id === SPACES,
               actions: () => [
                 {
-                  id: SpaceAction.OPEN_CREATE_SPACE,
+                  id: SpaceAction.OpenCreateSpace._tag,
                   data: async () => {
-                    await dispatch({
-                      plugin: SPACE_PLUGIN,
-                      action: SpaceAction.OPEN_CREATE_SPACE
-                    });
+                    await dispatch(createIntent8(SpaceAction.OpenCreateSpace));
                   },
                   properties: {
                     label: [
@@ -2655,17 +2710,13 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                     ],
                     icon: "ph--plus--regular",
                     testId: "spacePlugin.createSpace",
-                    disposition: "item",
-                    className: "border-t border-separator"
+                    disposition: "item"
                   }
                 },
                 {
-                  id: SpaceAction.JOIN,
+                  id: SpaceAction.Join._tag,
                   data: async () => {
-                    await dispatch({
-                      plugin: SPACE_PLUGIN,
-                      action: SpaceAction.JOIN
-                    });
+                    await dispatch(createIntent8(SpaceAction.Join));
                   },
                   properties: {
                     label: [
@@ -2676,10 +2727,25 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                     ],
                     icon: "ph--sign-in--regular",
                     testId: "spacePlugin.joinSpace",
-                    disposition: "item"
+                    disposition: "item",
+                    className: "border-b border-separator"
                   }
                 }
+              ]
+            }),
+            // Create spaces group node.
+            createExtension({
+              id: `${SPACE_PLUGIN}/root`,
+              filter: (node) => node.id === "root",
+              connector: () => [
+                spacesNode
               ],
+              resolver: ({ id }) => id === SPACES ? spacesNode : void 0
+            }),
+            // Create space nodes.
+            createExtension({
+              id: SPACES,
+              filter: (node) => node.id === SPACES,
               connector: () => {
                 const spaces = toSignal((onChange) => client.spaces.subscribe(() => onChange()).unsubscribe, () => client.spaces.get());
                 const isReady = toSignal((onChange) => client.spaces.isReady.subscribe(() => onChange()).unsubscribe, () => client.spaces.isReady.get());
@@ -2758,11 +2824,11 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 if (spaceState !== SpaceState2.SPACE_READY) {
                   return;
                 }
-                const collection = space.properties[CollectionType.typename];
+                const collection = space.properties[CollectionType.typename]?.target;
                 if (!collection) {
                   return;
                 }
-                return collection.objects.filter(nonNullable2).map((object) => createObjectNode({
+                return collection.objects.map((object) => object.target).filter(nonNullable2).map((object) => createObjectNode({
                   object,
                   space,
                   resolve,
@@ -2780,7 +2846,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 if (!space) {
                   return;
                 }
-                return collection.objects.filter(nonNullable2).map((object) => createObjectNode({
+                return collection.objects.map((object) => object.target).filter(nonNullable2).map((object) => createObjectNode({
                   object,
                   space,
                   resolve,
@@ -2808,11 +2874,13 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   if (!store.value) {
                     void space.db.query({
                       id: objectId
+                    }, {
+                      deleted: QueryOptions.ShowDeletedOption.SHOW_DELETED
                     }).first().then((o) => store.value = o).catch((err) => log3.catch(err, {
                       objectId
                     }, {
                       F: __dxlog_file6,
-                      L: 872,
+                      L: 919,
                       S: void 0,
                       C: (f, a) => f(...a)
                     }));
@@ -2909,7 +2977,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
           ];
         },
         serializer: (plugins) => {
-          const dispatch = resolvePlugin(plugins, parseIntentPlugin2)?.provides.intent.dispatch;
+          const dispatch = resolvePlugin(plugins, parseIntentPlugin)?.provides.intent.dispatchPromise;
           if (!dispatch) {
             return [];
           }
@@ -2934,14 +3002,11 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 type: DIRECTORY_TYPE
               }),
               deserialize: async (data) => {
-                const result = await dispatch({
-                  plugin: SPACE_PLUGIN,
-                  action: SpaceAction.CREATE,
-                  data: {
-                    name: data.name
-                  }
-                });
-                return result?.data.space;
+                const result = await dispatch(createIntent8(SpaceAction.Create, {
+                  name: data.name,
+                  edgeReplication: true
+                }));
+                return result.data?.space;
               }
             },
             {
@@ -2954,65 +3019,71 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               }),
               deserialize: async (data, ancestors) => {
                 const space = ancestors.find(isSpace4);
-                const collection = ancestors.findLast((ancestor) => ancestor instanceof CollectionType) ?? space?.properties[CollectionType.typename];
+                const collection = ancestors.findLast((ancestor) => ancestor instanceof CollectionType) ?? space?.properties[CollectionType.typename]?.target;
                 if (!space || !collection) {
                   return;
                 }
-                const result = await dispatch({
-                  plugin: SPACE_PLUGIN,
-                  action: SpaceAction.ADD_OBJECT,
-                  data: {
-                    target: collection,
-                    object: create(CollectionType, {
-                      name: data.name,
-                      objects: [],
-                      views: {}
-                    })
-                  }
-                });
-                return result?.data.object;
+                const result = await dispatch(createIntent8(SpaceAction.AddObject, {
+                  target: collection,
+                  object: create(CollectionType, {
+                    name: data.name,
+                    objects: [],
+                    views: {}
+                  })
+                }));
+                return result.data?.object;
               }
             }
           ];
         }
       },
       intent: {
-        resolver: async (intent, plugins) => {
-          const clientPlugin2 = resolvePlugin(plugins, parseClientPlugin);
-          const client = clientPlugin2?.provides.client;
-          switch (intent.action) {
-            case SpaceAction.WAIT_FOR_OBJECT: {
-              state.values.awaiting = intent.data?.id;
-              return {
-                data: true
-              };
-            }
-            case SpaceAction.OPEN_CREATE_SPACE: {
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: LayoutAction2.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/CreateSpaceDialog",
-                        dialogBlockAlign: "start",
-                        subject: intent.data
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case SpaceAction.CREATE: {
-              if (!client || !S2.is(SpaceForm)(intent.data)) {
-                return;
-              }
+        resolvers: ({ plugins, dispatchPromise: dispatch }) => {
+          const activeParts = resolvePlugin(plugins, parseNavigationPlugin2)?.provides.location.active;
+          const client = resolvePlugin(plugins, parseClientPlugin)?.provides.client;
+          const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
+          invariant2(activeParts, "Active parts not available.", {
+            F: __dxlog_file6,
+            L: 1078,
+            S: void 0,
+            A: [
+              "activeParts",
+              "'Active parts not available.'"
+            ]
+          });
+          invariant2(client, "Client not available.", {
+            F: __dxlog_file6,
+            L: 1079,
+            S: void 0,
+            A: [
+              "client",
+              "'Client not available.'"
+            ]
+          });
+          invariant2(resolve, "Metadata resolver not available.", {
+            F: __dxlog_file6,
+            L: 1080,
+            S: void 0,
+            A: [
+              "resolve",
+              "'Metadata resolver not available.'"
+            ]
+          });
+          return [
+            createResolver(SpaceAction.OpenCreateSpace, () => ({
+              intents: [
+                createIntent8(LayoutAction2.SetLayout, {
+                  element: "dialog",
+                  component: CREATE_SPACE_DIALOG,
+                  dialogBlockAlign: "start"
+                })
+              ]
+            })),
+            createResolver(SpaceAction.Create, async ({ name, edgeReplication }) => {
               const space = await client.spaces.create({
-                name: intent.data.name
+                name
               });
-              if (intent.data.edgeReplication) {
+              if (edgeReplication) {
                 await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting3.ENABLED);
               }
               await space.waitUntilReady();
@@ -3020,7 +3091,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 objects: [],
                 views: {}
               });
-              space.properties[CollectionType.typename] = collection;
+              space.properties[CollectionType.typename] = makeRef2(collection);
               if (Migrations2.versionProperty) {
                 space.properties[Migrations2.versionProperty] = Migrations2.targetVersion;
               }
@@ -3035,304 +3106,224 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   }
                 },
                 intents: [
-                  [
-                    {
-                      action: ObservabilityAction2.SEND_EVENT,
-                      data: {
-                        name: "space.create",
-                        properties: {
-                          spaceId: space.id
-                        }
-                      }
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.create",
+                    properties: {
+                      spaceId: space.id
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case SpaceAction.JOIN: {
+            }),
+            createResolver(SpaceAction.Join, ({ invitationCode }) => ({
+              intents: [
+                createIntent8(LayoutAction2.SetLayout, {
+                  element: "dialog",
+                  component: JOIN_DIALOG,
+                  dialogBlockAlign: "start",
+                  subject: {
+                    initialInvitationCode: invitationCode
+                  }
+                })
+              ]
+            })),
+            createResolver(SpaceAction.Share, ({ space }) => {
+              const active = navigationPlugin?.provides.location.active;
+              const mode = layoutPlugin?.provides.layout.layoutMode;
+              const current = active ? firstIdInPart(active, mode === "solo" ? "solo" : "main") : void 0;
+              const target = current?.startsWith(space.id) ? current : void 0;
               return {
-                data: true,
                 intents: [
-                  [
-                    {
-                      action: LayoutAction2.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/JoinDialog",
-                        dialogBlockAlign: "start",
-                        subject: {
-                          initialInvitationCode: intent.data?.invitationCode,
-                          onDone: intent.data?.onDone
-                        }
-                      }
+                  createIntent8(LayoutAction2.SetLayout, {
+                    element: "dialog",
+                    component: SPACE_SETTINGS_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      space,
+                      target,
+                      initialTab: "members",
+                      createInvitationUrl: createSpaceInvitationUrl
+                    }
+                  }),
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.share",
+                    properties: {
+                      space: space.id
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case SpaceAction.SHARE: {
-              const space = intent.data?.space;
-              if (isSpace4(space) && !space.properties[COMPOSER_SPACE_LOCK]) {
-                const active = navigationPlugin?.provides.location.active;
-                const mode = layoutPlugin?.provides.layout.layoutMode;
-                const current = active ? firstIdInPart(active, mode === "solo" ? "solo" : "main") : void 0;
-                const target = current?.startsWith(space.id) ? current : void 0;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: LayoutAction2.SET_LAYOUT,
-                        data: {
-                          element: "dialog",
-                          component: "dxos.org/plugin/space/SpaceSettingsDialog",
-                          dialogBlockAlign: "start",
-                          subject: {
-                            space,
-                            target,
-                            initialTab: "members",
-                            createInvitationUrl: createSpaceInvitationUrl
-                          }
-                        }
-                      }
-                    ],
-                    [
-                      {
-                        action: ObservabilityAction2.SEND_EVENT,
-                        data: {
-                          name: "space.share",
-                          properties: {
-                            space: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.LOCK: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                space.properties[COMPOSER_SPACE_LOCK] = true;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: ObservabilityAction2.SEND_EVENT,
-                        data: {
-                          name: "space.lock",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.UNLOCK: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                space.properties[COMPOSER_SPACE_LOCK] = false;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: ObservabilityAction2.SEND_EVENT,
-                        data: {
-                          name: "space.unlock",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.RENAME: {
-              const { caller, space } = intent.data ?? {};
-              if (typeof caller === "string" && isSpace4(space)) {
-                return {
-                  intents: [
-                    [
-                      {
-                        action: LayoutAction2.SET_LAYOUT,
-                        data: {
-                          element: "popover",
-                          anchorId: `dxos.org/ui/${caller}/${space.id}`,
-                          component: "dxos.org/plugin/space/RenameSpacePopover",
-                          subject: space
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.OPEN_SETTINGS: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: LayoutAction2.SET_LAYOUT,
-                        data: {
-                          element: "dialog",
-                          component: "dxos.org/plugin/space/SpaceSettingsDialog",
-                          dialogBlockAlign: "start",
-                          subject: {
-                            space,
-                            initialTab: "settings",
-                            createInvitationUrl: createSpaceInvitationUrl
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.OPEN: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                await space.open();
-                return {
-                  data: true
-                };
-              }
-              break;
-            }
-            case SpaceAction.CLOSE: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                await space.close();
-                return {
-                  data: true
-                };
-              }
-              break;
-            }
-            case SpaceAction.MIGRATE: {
-              const space = intent.data?.space;
-              if (isSpace4(space)) {
-                if (space.state.get() === SpaceState2.SPACE_REQUIRES_MIGRATION) {
-                  state.values.sdkMigrationRunning[space.id] = true;
-                  await space.internal.migrate();
-                  state.values.sdkMigrationRunning[space.id] = false;
-                }
-                const result = await Migrations2.migrate(space, intent.data?.version);
-                return {
-                  data: result,
-                  intents: [
-                    [
-                      {
-                        action: ObservabilityAction2.SEND_EVENT,
-                        data: {
-                          name: "space.migrate",
-                          properties: {
-                            spaceId: space.id,
-                            version: intent.data?.version
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case SpaceAction.OPEN_CREATE_OBJECT: {
+            }, {
+              filter: (data) => !data.space.properties[COMPOSER_SPACE_LOCK]
+            }),
+            createResolver(SpaceAction.Lock, ({ space }) => {
+              space.properties[COMPOSER_SPACE_LOCK] = true;
               return {
-                data: true,
                 intents: [
-                  [
-                    {
-                      action: LayoutAction2.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/CreateObjectDialog",
-                        dialogBlockAlign: "start",
-                        subject: intent.data
-                      }
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.lock",
+                    properties: {
+                      spaceId: space.id
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case SpaceAction.ADD_OBJECT: {
-              const object = intent.data?.object ?? intent.data?.result;
-              if (!isReactiveObject3(object)) {
-                return;
-              }
-              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace5(intent.data?.target);
-              if (!space) {
-                return;
+            }),
+            createResolver(SpaceAction.Unlock, ({ space }) => {
+              space.properties[COMPOSER_SPACE_LOCK] = false;
+              return {
+                intents: [
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.unlock",
+                    properties: {
+                      spaceId: space.id
+                    }
+                  })
+                ]
+              };
+            }),
+            createResolver(SpaceAction.Rename, ({ caller, space }) => {
+              return {
+                intents: [
+                  createIntent8(LayoutAction2.SetLayout, {
+                    element: "popover",
+                    anchorId: `dxos.org/ui/${caller}/${space.id}`,
+                    component: POPOVER_RENAME_SPACE,
+                    subject: space
+                  })
+                ]
+              };
+            }),
+            createResolver(SpaceAction.OpenSettings, ({ space }) => {
+              return {
+                intents: [
+                  createIntent8(LayoutAction2.SetLayout, {
+                    element: "dialog",
+                    component: SPACE_SETTINGS_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      space,
+                      initialTab: "settings",
+                      createInvitationUrl: createSpaceInvitationUrl
+                    }
+                  })
+                ]
+              };
+            }),
+            createResolver(SpaceAction.Open, async ({ space }) => {
+              await space.open();
+            }),
+            createResolver(SpaceAction.Close, async ({ space }) => {
+              await space.close();
+            }),
+            createResolver(SpaceAction.Migrate, async ({ space, version }) => {
+              if (space.state.get() === SpaceState2.SPACE_REQUIRES_MIGRATION) {
+                state.values.sdkMigrationRunning[space.id] = true;
+                await space.internal.migrate();
+                state.values.sdkMigrationRunning[space.id] = false;
               }
+              const result = await Migrations2.migrate(space, version);
+              return {
+                data: result,
+                intents: [
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.migrate",
+                    properties: {
+                      spaceId: space.id,
+                      version
+                    }
+                  })
+                ]
+              };
+            }),
+            createResolver(SpaceAction.OpenCreateObject, ({ target, navigable = true }) => {
+              return {
+                intents: [
+                  createIntent8(LayoutAction2.SetLayout, {
+                    element: "dialog",
+                    component: CREATE_OBJECT_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      target,
+                      shouldNavigate: navigable ? (object) => !(object instanceof CollectionType) || state.values.navigableCollections : () => false
+                    }
+                  })
+                ]
+              };
+            }),
+            createResolver(SpaceAction.AddObject, async ({ target, object }) => {
+              const space = isSpace4(target) ? target : getSpace5(target);
+              invariant2(space, "Space not found.", {
+                F: __dxlog_file6,
+                L: 1265,
+                S: void 0,
+                A: [
+                  "space",
+                  "'Space not found.'"
+                ]
+              });
               if (space.db.coreDatabase.getAllObjectIds().length >= SPACE_MAX_OBJECTS) {
-                return {
-                  data: false,
-                  intents: [
-                    [
+                void dispatch(createIntent8(LayoutAction2.SetLayout, {
+                  element: "toast",
+                  subject: {
+                    id: `${SPACE_PLUGIN}/space-limit`,
+                    title: [
+                      "space limit label",
                       {
-                        action: LayoutAction2.SET_LAYOUT,
-                        data: {
-                          element: "toast",
-                          subject: {
-                            id: `${SPACE_PLUGIN}/space-limit`,
-                            title: translations_default[0]["en-US"][SPACE_PLUGIN]["space limit label"],
-                            description: translations_default[0]["en-US"][SPACE_PLUGIN]["space limit description"],
-                            duration: 5e3,
-                            icon: "ph--warning--regular",
-                            actionLabel: translations_default[0]["en-US"][SPACE_PLUGIN]["remove deleted objects label"],
-                            actionAlt: translations_default[0]["en-US"][SPACE_PLUGIN]["remove deleted objects alt"],
-                            // TODO(wittjosiah): Use OS namespace.
-                            closeLabel: translations_default[0]["en-US"][SPACE_PLUGIN]["space limit close label"],
-                            onAction: () => space.db.coreDatabase.unlinkDeletedObjects()
-                          }
-                        }
+                        ns: SPACE_PLUGIN
                       }
                     ],
-                    [
+                    description: [
+                      "space limit description",
                       {
-                        action: ObservabilityAction2.SEND_EVENT,
-                        data: {
-                          name: "space.limit",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
+                        ns: SPACE_PLUGIN
                       }
-                    ]
-                  ]
-                };
+                    ],
+                    duration: 5e3,
+                    icon: "ph--warning--regular",
+                    actionLabel: [
+                      "remove deleted objects label",
+                      {
+                        ns: SPACE_PLUGIN
+                      }
+                    ],
+                    actionAlt: [
+                      "remove deleted objects alt",
+                      {
+                        ns: SPACE_PLUGIN
+                      }
+                    ],
+                    closeLabel: [
+                      "close label",
+                      {
+                        ns: "os"
+                      }
+                    ],
+                    onAction: () => space.db.coreDatabase.unlinkDeletedObjects()
+                  }
+                }));
+                void dispatch(createIntent8(ObservabilityAction2.SendEvent, {
+                  name: "space.limit",
+                  properties: {
+                    spaceId: space.id
+                  }
+                }));
+                throw new Error("Space limit reached.");
               }
-              if (intent.data?.target instanceof CollectionType) {
-                intent.data?.target.objects.push(object);
-              } else if (isSpace4(intent.data?.target)) {
-                const collection = space.properties[CollectionType.typename];
+              if (target instanceof CollectionType) {
+                target.objects.push(makeRef2(object));
+              } else if (isSpace4(target)) {
+                const collection = space.properties[CollectionType.typename]?.target;
                 if (collection instanceof CollectionType) {
-                  collection.objects.push(object);
+                  collection.objects.push(makeRef2(object));
                 } else {
                   const collection2 = create(CollectionType, {
                     objects: [
-                      object
+                      makeRef2(object)
                     ],
                     views: {}
                   });
-                  space.properties[CollectionType.typename] = collection2;
+                  space.properties[CollectionType.typename] = makeRef2(collection2);
                 }
               }
               return {
@@ -3346,178 +3337,147 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   }
                 },
                 intents: [
-                  [
-                    {
-                      action: ObservabilityAction2.SEND_EVENT,
-                      data: {
-                        name: "space.object.add",
-                        properties: {
-                          spaceId: space.id,
-                          objectId: object.id,
-                          typename: getTypename2(object)
-                        }
-                      }
+                  createIntent8(ObservabilityAction2.SendEvent, {
+                    name: "space.object.add",
+                    properties: {
+                      spaceId: space.id,
+                      objectId: object.id,
+                      typename: getTypename2(object)
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case SpaceAction.REMOVE_OBJECTS: {
-              const objects = intent.data?.objects ?? intent.data?.result;
-              invariant2(Array.isArray(objects), void 0, {
+            }),
+            createResolver(SpaceAction.RemoveObjects, async ({ objects, target, deletionData }, undo) => {
+              const space = getSpace5(objects[0]);
+              invariant2(space && objects.every((obj) => isEchoObject2(obj) && getSpace5(obj) === space), void 0, {
                 F: __dxlog_file6,
-                L: 1412,
+                L: 1330,
                 S: void 0,
                 A: [
-                  "Array.isArray(objects)",
+                  "space && objects.every((obj) => isEchoObject(obj) && getSpace(obj) === space)",
                   ""
                 ]
               });
-              const space = getSpace5(objects[0]);
-              if (!space || !objects.every((obj) => isEchoObject2(obj) && getSpace5(obj) === space)) {
-                return;
-              }
-              const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
-              const activeParts = navigationPlugin?.provides.location.active;
               const openObjectIds = new Set(openIds(activeParts ?? {}));
-              if (!intent.undo && resolve) {
-                const parentCollection = intent.data?.collection ?? space.properties[CollectionType.typename];
+              if (!undo) {
+                const parentCollection = target ?? space.properties[CollectionType.typename]?.target;
                 const nestedObjectsList = await Promise.all(objects.map((obj) => getNestedObjects(obj, resolve)));
-                const deletionData = {
+                const deletionData2 = {
                   objects,
                   parentCollection,
-                  indices: objects.map((obj) => parentCollection instanceof CollectionType ? parentCollection.objects.indexOf(obj) : -1),
+                  indices: objects.map((obj) => parentCollection instanceof CollectionType ? parentCollection.objects.findIndex((object) => object.target === obj) : -1),
                   nestedObjectsList,
                   wasActive: objects.flatMap((obj, i) => [
                     obj,
                     ...nestedObjectsList[i]
                   ]).map((obj) => fullyQualifiedId4(obj)).filter((id) => openObjectIds.has(id))
                 };
-                if (deletionData.wasActive.length > 0) {
-                  await intentPlugin?.provides.intent.dispatch({
-                    action: NavigationAction4.CLOSE,
-                    data: {
-                      activeParts: {
-                        main: deletionData.wasActive,
-                        sidebar: deletionData.wasActive
-                      }
-                    }
-                  });
-                }
-                if (deletionData.parentCollection instanceof CollectionType) {
+                if (deletionData2.parentCollection instanceof CollectionType) {
                   [
-                    ...deletionData.indices
+                    ...deletionData2.indices
                   ].sort((a, b) => b - a).forEach((index) => {
                     if (index !== -1) {
-                      deletionData.parentCollection.objects.splice(index, 1);
+                      deletionData2.parentCollection.objects.splice(index, 1);
                     }
                   });
                 }
-                deletionData.nestedObjectsList.flat().forEach((obj) => {
+                deletionData2.nestedObjectsList.flat().forEach((obj) => {
                   space.db.remove(obj);
                 });
                 objects.forEach((obj) => space.db.remove(obj));
                 const undoMessageKey = objects.some((obj) => obj instanceof CollectionType) ? "collection deleted label" : objects.length > 1 ? "objects deleted label" : "object deleted label";
                 return {
-                  data: true,
                   undoable: {
                     // TODO(ZaymonFC): Pluralize if more than one object.
-                    message: translations_default[0]["en-US"][SPACE_PLUGIN][undoMessageKey],
-                    data: deletionData
-                  }
+                    message: [
+                      undoMessageKey,
+                      {
+                        ns: SPACE_PLUGIN
+                      }
+                    ],
+                    data: {
+                      deletionData: deletionData2
+                    }
+                  },
+                  intents: deletionData2.wasActive.length > 0 ? [
+                    createIntent8(NavigationAction5.Close, {
+                      activeParts: {
+                        main: deletionData2.wasActive
+                      }
+                    })
+                  ] : void 0
                 };
               } else {
-                const undoData = intent.data;
-                if (undoData?.objects?.length && undoData.objects.every(isEchoObject2) && undoData.parentCollection instanceof CollectionType) {
-                  const restoredObjects = undoData.objects.map((obj) => space.db.add(obj));
-                  undoData.nestedObjectsList.flat().forEach((obj) => {
+                if (deletionData?.objects?.length && deletionData.objects.every(isEchoObject2) && deletionData.parentCollection instanceof CollectionType) {
+                  const restoredObjects = deletionData.objects.map((obj) => space.db.add(obj));
+                  deletionData.nestedObjectsList.flat().forEach((obj) => {
                     space.db.add(obj);
                   });
-                  undoData.indices.forEach((index, i) => {
+                  deletionData.indices.forEach((index, i) => {
                     if (index !== -1) {
-                      undoData.parentCollection.objects.splice(index, 0, restoredObjects[i]);
+                      deletionData.parentCollection.objects.splice(index, 0, makeRef2(restoredObjects[i]));
                     }
                   });
-                  if (undoData.wasActive.length > 0) {
-                    await intentPlugin?.provides.intent.dispatch({
-                      action: NavigationAction4.OPEN,
-                      data: {
+                  return {
+                    intents: deletionData.wasActive.length > 0 ? [
+                      createIntent8(NavigationAction5.Open, {
                         activeParts: {
-                          main: undoData.wasActive
+                          main: deletionData.wasActive
                         }
-                      }
-                    });
-                  }
-                  return {
-                    data: true
+                      })
+                    ] : void 0
                   };
                 }
-                return {
-                  data: false
-                };
-              }
-            }
-            case SpaceAction.RENAME_OBJECT: {
-              const object = intent.data?.object ?? intent.data?.result;
-              const caller = intent.data?.caller;
-              if (isReactiveObject3(object) && caller) {
-                return {
-                  intents: [
-                    [
-                      {
-                        action: LayoutAction2.SET_LAYOUT,
-                        data: {
-                          element: "popover",
-                          anchorId: `dxos.org/ui/${caller}/${fullyQualifiedId4(object)}`,
-                          component: "dxos.org/plugin/space/RenameObjectPopover",
-                          subject: object
-                        }
-                      }
-                    ]
-                  ]
-                };
               }
-              break;
-            }
-            case SpaceAction.DUPLICATE_OBJECT: {
-              const originalObject = intent.data?.object ?? intent.data?.result;
-              const resolve = resolvePlugin(plugins, parseMetadataResolverPlugin)?.provides.metadata.resolver;
-              const space = isSpace4(intent.data?.target) ? intent.data?.target : getSpace5(intent.data?.target);
-              if (!isEchoObject2(originalObject) || !resolve || !space) {
-                return;
-              }
-              const newObject = await cloneObject(originalObject, resolve, space);
-              return {
-                intents: [
-                  [
-                    {
-                      action: SpaceAction.ADD_OBJECT,
-                      data: {
-                        object: newObject,
-                        target: intent.data?.target
-                      }
-                    }
-                  ]
+            }),
+            createResolver(SpaceAction.RenameObject, async ({ object, caller }) => ({
+              intents: [
+                createIntent8(LayoutAction2.SetLayout, {
+                  element: "popover",
+                  anchorId: `dxos.org/ui/${caller}/${fullyQualifiedId4(object)}`,
+                  component: POPOVER_RENAME_OBJECT,
+                  subject: object
+                })
+              ]
+            })),
+            createResolver(SpaceAction.DuplicateObject, async ({ object, target }) => {
+              const space = isSpace4(target) ? target : getSpace5(target);
+              invariant2(space, "Space not found.", {
+                F: __dxlog_file6,
+                L: 1429,
+                S: void 0,
+                A: [
+                  "space",
+                  "'Space not found.'"
                 ]
-              };
-            }
-            case SpaceAction.TOGGLE_HIDDEN: {
-              settings.values.showHidden = intent.data?.state ?? !settings.values.showHidden;
-              return {
-                data: true
-              };
-            }
-            case CollectionAction.CREATE: {
-              const collection = create(CollectionType, {
-                name: intent.data?.name,
-                objects: [],
-                views: {}
               });
+              const newObject = await cloneObject(object, resolve, space);
               return {
-                data: collection
+                intents: [
+                  createIntent8(SpaceAction.AddObject, {
+                    object: newObject,
+                    target
+                  })
+                ]
               };
-            }
-          }
+            }),
+            createResolver(SpaceAction.WaitForObject, async ({ id }) => {
+              state.values.awaiting = id;
+            }),
+            createResolver(SpaceAction.ToggleHidden, async ({ state: state2 }) => {
+              settings.values.showHidden = state2;
+            }),
+            createResolver(CollectionAction.Create, async ({ name }) => ({
+              data: {
+                object: create(CollectionType, {
+                  name,
+                  objects: [],
+                  views: {}
+                })
+              }
+            }))
+          ];
         }
       }
     }
@@ -3530,6 +3490,8 @@ export {
   ActorSchema,
   AwaitingObject,
   COMPOSER_SPACE_LOCK,
+  CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG,
   ChannelType,
   CollectionAction,
   CollectionMain,
@@ -3541,19 +3503,23 @@ export {
   DefaultObjectSettings,
   FullPresence,
   InlineSyncStatus,
-  InlineSyncStatusIndicator,
+  JOIN_DIALOG,
   JoinDialog,
   MenuFooter,
   MessageState,
   MessageType,
+  POPOVER_RENAME_OBJECT,
+  POPOVER_RENAME_SPACE,
   PersistenceStatus,
   PopoverRenameObject,
   PopoverRenameSpace,
   SHARED,
   SPACES,
+  SPACE_ACTION,
   SPACE_DIRECTORY_HANDLE,
   SPACE_PLUGIN,
   SPACE_PLUGIN_SHORT_ID,
+  SPACE_SETTINGS_DIALOG,
   SPACE_TYPE,
   ShareSpaceButton,
   ShareSpaceButtonImpl,