@dxos/plugin-space 0.7.4 → 0.7.5-main.499c70c

package/dist/lib/node/index.cjs

@@ -28,40 +28,46 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
-  ActorSchema: () => import_chunk_6SNOZF7Y.ActorSchema,
+  ActorSchema: () => import_chunk_YF2AQ7KP.ActorSchema,
   AwaitingObject: () => AwaitingObject,
   COMPOSER_SPACE_LOCK: () => COMPOSER_SPACE_LOCK,
-  ChannelType: () => import_chunk_6SNOZF7Y.ChannelType,
-  CollectionAction: () => import_chunk_QNVEU2UD.CollectionAction,
+  CREATE_OBJECT_DIALOG: () => CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG: () => CREATE_SPACE_DIALOG,
+  ChannelType: () => import_chunk_YF2AQ7KP.ChannelType,
+  CollectionAction: () => import_chunk_YF2AQ7KP.CollectionAction,
   CollectionMain: () => CollectionMain,
   CollectionSection: () => CollectionSection,
-  CollectionType: () => import_chunk_6SNOZF7Y.CollectionType,
-  ContactType: () => import_chunk_6SNOZF7Y.ContactType,
+  CollectionType: () => import_chunk_YF2AQ7KP.CollectionType,
+  ContactType: () => import_chunk_YF2AQ7KP.ContactType,
   CreateObjectDialog: () => CreateObjectDialog,
   CreateSpaceDialog: () => CreateSpaceDialog,
   DefaultObjectSettings: () => DefaultObjectSettings,
   FullPresence: () => FullPresence,
   InlineSyncStatus: () => InlineSyncStatus,
-  InlineSyncStatusIndicator: () => InlineSyncStatusIndicator,
+  JOIN_DIALOG: () => JOIN_DIALOG,
   JoinDialog: () => JoinDialog,
   MenuFooter: () => MenuFooter,
-  MessageState: () => import_chunk_6SNOZF7Y.MessageState,
-  MessageType: () => import_chunk_6SNOZF7Y.MessageType,
+  MessageState: () => import_chunk_YF2AQ7KP.MessageState,
+  MessageType: () => import_chunk_YF2AQ7KP.MessageType,
+  POPOVER_RENAME_OBJECT: () => POPOVER_RENAME_OBJECT,
+  POPOVER_RENAME_SPACE: () => POPOVER_RENAME_SPACE,
   PersistenceStatus: () => PersistenceStatus,
   PopoverRenameObject: () => PopoverRenameObject,
   PopoverRenameSpace: () => PopoverRenameSpace,
   SHARED: () => SHARED,
   SPACES: () => SPACES,
-  SPACE_DIRECTORY_HANDLE: () => import_chunk_6SNOZF7Y.SPACE_DIRECTORY_HANDLE,
-  SPACE_PLUGIN: () => import_chunk_QNVEU2UD.SPACE_PLUGIN,
-  SPACE_PLUGIN_SHORT_ID: () => import_chunk_QNVEU2UD.SPACE_PLUGIN_SHORT_ID,
+  SPACE_ACTION: () => import_chunk_YF2AQ7KP.SPACE_ACTION,
+  SPACE_DIRECTORY_HANDLE: () => import_chunk_YF2AQ7KP.SPACE_DIRECTORY_HANDLE,
+  SPACE_PLUGIN: () => import_chunk_46S3JOES.SPACE_PLUGIN,
+  SPACE_PLUGIN_SHORT_ID: () => import_chunk_46S3JOES.SPACE_PLUGIN_SHORT_ID,
+  SPACE_SETTINGS_DIALOG: () => SPACE_SETTINGS_DIALOG,
   SPACE_TYPE: () => SPACE_TYPE,
   ShareSpaceButton: () => ShareSpaceButton,
   ShareSpaceButtonImpl: () => ShareSpaceButtonImpl,
   SmallPresence: () => SmallPresence,
   SmallPresenceLive: () => SmallPresenceLive,
-  SpaceAction: () => import_chunk_QNVEU2UD.SpaceAction,
-  SpaceForm: () => import_chunk_6SNOZF7Y.SpaceForm,
+  SpaceAction: () => import_chunk_YF2AQ7KP.SpaceAction,
+  SpaceForm: () => import_chunk_YF2AQ7KP.SpaceForm,
   SpacePlugin: () => SpacePlugin,
   SpacePluginSettings: () => SpacePluginSettings,
   SpacePresence: () => SpacePresence,
@@ -70,8 +76,8 @@ __export(node_exports, {
   SyncStatus: () => SyncStatus,
   SyncStatusDetail: () => SyncStatusDetail,
   SyncStatusIndicator: () => SyncStatusIndicator,
-  ThreadStatus: () => import_chunk_6SNOZF7Y.ThreadStatus,
-  ThreadType: () => import_chunk_6SNOZF7Y.ThreadType,
+  ThreadStatus: () => import_chunk_YF2AQ7KP.ThreadStatus,
+  ThreadType: () => import_chunk_YF2AQ7KP.ThreadType,
   cloneObject: () => cloneObject,
   constructObjectActions: () => constructObjectActions,
   constructSpaceActions: () => constructSpaceActions,
@@ -82,18 +88,17 @@ __export(node_exports, {
   getNestedObjects: () => getNestedObjects,
   getSpaceDisplayName: () => getSpaceDisplayName,
   memoizeQuery: () => memoizeQuery,
-  parseSchemaPlugin: () => import_chunk_6SNOZF7Y.parseSchemaPlugin,
+  parseSchemaPlugin: () => import_chunk_YF2AQ7KP.parseSchemaPlugin,
   parseSpacePlugin: () => parseSpacePlugin,
   translations: () => translations_default
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_QNVEU2UD = require("./chunk-QNVEU2UD.cjs");
-var import_chunk_6SNOZF7Y = require("./chunk-6SNOZF7Y.cjs");
+var import_chunk_YF2AQ7KP = require("./chunk-YF2AQ7KP.cjs");
+var import_chunk_46S3JOES = require("./chunk-46S3JOES.cjs");
 var import_signals_core = require("@preact/signals-core");
 var import_react = __toESM(require("react"));
 var import_app_framework = require("@dxos/app-framework");
 var import_async = require("@dxos/async");
-var import_echo_schema = require("@dxos/echo-schema");
 var import_core = require("@dxos/echo-signals/core");
 var import_invariant = require("@dxos/invariant");
 var import_live_object = require("@dxos/live-object");
@@ -101,9 +106,9 @@ var import_local_storage = require("@dxos/local-storage");
 var import_log = require("@dxos/log");
 var import_migrations = require("@dxos/migrations");
 var import_plugin_attention = require("@dxos/plugin-attention");
-var import_plugin_client = require("@dxos/plugin-client");
+var import_types = require("@dxos/plugin-client/types");
 var import_plugin_graph = require("@dxos/plugin-graph");
-var import_meta = require("@dxos/plugin-observability/meta");
+var import_types2 = require("@dxos/plugin-observability/types");
 var import_metadata = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_react_client = require("@dxos/react-client");
 var import_echo = require("@dxos/react-client/echo");
@@ -116,26 +121,28 @@ var import_react_client2 = require("@dxos/react-client");
 var import_echo2 = require("@dxos/react-client/echo");
 var import_react_ui = require("@dxos/react-ui");
 var import_react_ui_theme = require("@dxos/react-ui-theme");
+var import_effect = require("effect");
 var import_react5 = __toESM(require("react"));
 var import_app_framework3 = require("@dxos/app-framework");
 var import_react_client3 = require("@dxos/react-client");
 var import_echo3 = require("@dxos/react-client/echo");
 var import_react_ui2 = require("@dxos/react-ui");
 var import_react6 = __toESM(require("react"));
-var import_echo_schema2 = require("@dxos/echo-schema");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_echo4 = require("@dxos/react-client/echo");
 var import_react_ui3 = require("@dxos/react-ui");
 var import_react_ui_form = require("@dxos/react-ui-form");
 var import_react_ui_searchlist = require("@dxos/react-ui-searchlist");
 var import_util2 = require("@dxos/util");
-var import_echo_schema3 = require("@dxos/echo-schema");
+var import_app_framework4 = require("@dxos/app-framework");
+var import_echo_schema2 = require("@dxos/echo-schema");
 var import_invariant2 = require("@dxos/invariant");
 var import_live_object2 = require("@dxos/live-object");
 var import_migrations2 = require("@dxos/migrations");
 var import_plugin_graph2 = require("@dxos/plugin-graph");
 var import_echo5 = require("@dxos/react-client/echo");
 var import_react7 = __toESM(require("react"));
-var import_app_framework4 = require("@dxos/app-framework");
+var import_app_framework5 = require("@dxos/app-framework");
 var import_react_ui4 = require("@dxos/react-ui");
 var import_react_ui_form2 = require("@dxos/react-ui-form");
 var import_react8 = __toESM(require("react"));
@@ -146,9 +153,9 @@ var import_react_ui6 = require("@dxos/react-ui");
 var import_react10 = __toESM(require("react"));
 var import_react_ui7 = require("@dxos/react-ui");
 var import_react11 = __toESM(require("react"));
-var import_app_framework5 = require("@dxos/app-framework");
+var import_app_framework6 = require("@dxos/app-framework");
 var import_plugin_graph3 = require("@dxos/plugin-graph");
-var import_meta2 = require("@dxos/plugin-observability/meta");
+var import_types3 = require("@dxos/plugin-observability/types");
 var import_echo6 = require("@dxos/react-client/echo");
 var import_react_ui8 = require("@dxos/react-ui");
 var import_react12 = require("@dxos/shell/react");
@@ -168,52 +175,57 @@ var import_react_ui11 = require("@dxos/react-ui");
 var import_react18 = __toESM(require("react"));
 var import_react_ui12 = require("@dxos/react-ui");
 var import_react19 = __toESM(require("react"));
-var import_app_framework6 = require("@dxos/app-framework");
+var import_app_framework7 = require("@dxos/app-framework");
 var import_react_ui13 = require("@dxos/react-ui");
 var import_react20 = __toESM(require("react"));
-var import_app_framework7 = require("@dxos/app-framework");
+var import_app_framework8 = require("@dxos/app-framework");
 var import_display_name = require("@dxos/display-name");
+var import_plugin_graph4 = require("@dxos/plugin-graph");
 var import_react_client5 = require("@dxos/react-client");
 var import_echo8 = require("@dxos/react-client/echo");
 var import_halo = require("@dxos/react-client/halo");
 var import_react_ui14 = require("@dxos/react-ui");
 var import_react_ui_attention = require("@dxos/react-ui-attention");
 var import_util3 = require("@dxos/util");
-var import_react21 = __toESM(require("react"));
-var import_app_framework8 = require("@dxos/app-framework");
+var import_react21 = require("react");
+var import_react22 = __toESM(require("react"));
+var import_app_framework9 = require("@dxos/app-framework");
 var import_react_ui15 = require("@dxos/react-ui");
 var import_react_ui_form3 = require("@dxos/react-ui-form");
-var import_react22 = __toESM(require("react"));
+var import_react23 = __toESM(require("react"));
 var import_react_client6 = require("@dxos/react-client");
 var import_react_ui16 = require("@dxos/react-ui");
 var import_react_ui_tabs = require("@dxos/react-ui-tabs");
-var import_react23 = require("@dxos/shell/react");
-var import_react24 = __toESM(require("react"));
+var import_react24 = require("@dxos/shell/react");
+var import_react25 = __toESM(require("react"));
 var import_log3 = require("@dxos/log");
 var import_metadata2 = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_react_client7 = require("@dxos/react-client");
 var import_react_ui17 = require("@dxos/react-ui");
 var import_react_ui_form4 = require("@dxos/react-ui-form");
-var import_react25 = __toESM(require("react"));
+var import_react_ui_theme4 = require("@dxos/react-ui-theme");
+var import_react26 = __toESM(require("react"));
+var import_plugin_graph5 = require("@dxos/plugin-graph");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_metadata3 = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_react_client8 = require("@dxos/react-client");
 var import_react_ui18 = require("@dxos/react-ui");
-var import_react26 = require("react");
+var import_react_ui_attention2 = require("@dxos/react-ui-attention");
+var import_react27 = require("react");
 var import_context = require("@dxos/context");
 var import_protocols = require("@dxos/protocols");
 var import_react_client9 = require("@dxos/react-client");
-var import_react27 = __toESM(require("react"));
+var import_react28 = __toESM(require("react"));
 var import_plugin_status_bar = require("@dxos/plugin-status-bar");
 var import_react_client10 = require("@dxos/react-client");
 var import_react_ui19 = require("@dxos/react-ui");
 var import_react_ui_syntax_highlighter = require("@dxos/react-ui-syntax-highlighter");
-var import_react_ui_theme4 = require("@dxos/react-ui-theme");
-var import_react28 = __toESM(require("react"));
+var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_react29 = __toESM(require("react"));
 var import_react_client11 = require("@dxos/react-client");
 var import_echo9 = require("@dxos/react-client/echo");
 var import_react_ui20 = require("@dxos/react-ui");
-var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_react_ui_theme6 = require("@dxos/react-ui-theme");
 var import_context2 = require("@dxos/context");
 var WAIT_FOR_OBJECT_TIMEOUT = 18e4;
 var TOAST_TIMEOUT = 24e4;
@@ -221,8 +233,8 @@ var AwaitingObject = ({ id }) => {
   const [open, setOpen] = (0, import_react4.useState)(true);
   const [waiting, setWaiting] = (0, import_react4.useState)(true);
   const [found, setFound] = (0, import_react4.useState)(false);
-  const { t } = (0, import_react_ui.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const intentPlugin = (0, import_app_framework2.useResolvePlugin)(import_app_framework2.parseIntentPlugin);
+  const { t } = (0, import_react_ui.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = (0, import_app_framework2.useIntentDispatcher)();
   const navigationPlugin = (0, import_app_framework2.useResolvePlugin)(import_app_framework2.parseNavigationPlugin);
   const client = (0, import_react_client2.useClient)();
   const objects = (0, import_echo2.useQuery)(client.spaces, import_echo2.Filter.all());
@@ -247,28 +259,27 @@ var AwaitingObject = ({ id }) => {
   }, [
     id,
     objects,
-    intentPlugin
+    navigationPlugin
   ]);
-  const handleClose = async () => intentPlugin?.provides.intent.dispatch({
-    plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-    action: import_chunk_QNVEU2UD.SpaceAction.WAIT_FOR_OBJECT,
-    data: {
-      id: void 0
-    }
-  });
-  const handleNavigate = () => {
-    void intentPlugin?.provides.intent.dispatch({
-      action: import_app_framework2.NavigationAction.OPEN,
-      data: {
-        activeParts: {
-          main: [
-            id
-          ]
-        }
+  const handleClose = (0, import_react4.useCallback)(async () => dispatch((0, import_app_framework2.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.WaitForObject, {
+    id: void 0
+  })), [
+    dispatch
+  ]);
+  const handleNavigate = (0, import_react4.useCallback)(() => {
+    void dispatch((0, import_app_framework2.createIntent)(import_app_framework2.NavigationAction.Open, {
+      activeParts: {
+        main: [
+          id
+        ]
       }
-    });
+    }));
     void handleClose();
-  };
+  }, [
+    id,
+    handleClose,
+    dispatch
+  ]);
   return /* @__PURE__ */ import_react4.default.createElement(import_react_ui.Toast.Root, {
     open,
     duration: TOAST_TIMEOUT,
@@ -302,7 +313,7 @@ var AwaitingObject = ({ id }) => {
   })))));
 };
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/util.tsx";
-var SPACES = `${import_chunk_QNVEU2UD.SPACE_PLUGIN}-spaces`;
+var SPACES = `${import_chunk_46S3JOES.SPACE_PLUGIN}-spaces`;
 var SPACE_TYPE = "dxos.org/type/Space";
 var COMPOSER_SPACE_LOCK = "dxos.org/plugin/space/lock";
 var SHARED = "shared-spaces";
@@ -321,12 +332,12 @@ var getSpaceDisplayName = (space, { personal, namesCache = {} } = {}) => {
   return space.state.get() === import_echo5.SpaceState.SPACE_READY && (space.properties.name?.length ?? 0) > 0 ? space.properties.name : namesCache[space.id] ? namesCache[space.id] : personal ? [
     "personal space label",
     {
-      ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+      ns: import_chunk_46S3JOES.SPACE_PLUGIN
     }
   ] : [
     "unnamed space label",
     {
-      ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+      ns: import_chunk_46S3JOES.SPACE_PLUGIN
     }
   ];
 };
@@ -341,19 +352,19 @@ var getCollectionGraphNodePartials = ({ navigable, collection, space, resolve })
     ]),
     role: "branch",
     onRearrangeChildren: (nextOrder) => {
-      collection.objects = nextOrder.filter(import_echo5.isEchoObject);
+      collection.objects = nextOrder.filter(import_echo5.isEchoObject).map(import_live_object2.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, (0, import_live_object2.makeRef)(child.data));
         } else {
-          collection.objects.push(child.data);
+          collection.objects.push((0, import_live_object2.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);
       }
@@ -362,9 +373,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, (0, import_live_object2.makeRef)(newObject));
       } else {
-        collection.objects.push(newObject);
+        collection.objects.push((0, import_live_object2.makeRef)(newObject));
       }
     }
   };
@@ -374,8 +385,8 @@ var checkPendingMigration = (space) => {
 };
 var constructSpaceNode = ({ space, navigable = false, personal, namesCache, resolve }) => {
   const hasPendingMigration = checkPendingMigration(space);
-  const collection = space.state.get() === import_echo5.SpaceState.SPACE_READY && space.properties[import_chunk_6SNOZF7Y.CollectionType.typename];
-  const partials = space.state.get() === import_echo5.SpaceState.SPACE_READY && collection instanceof import_chunk_6SNOZF7Y.CollectionType ? getCollectionGraphNodePartials({
+  const collection = space.state.get() === import_echo5.SpaceState.SPACE_READY && space.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target;
+  const partials = space.state.get() === import_echo5.SpaceState.SPACE_READY && collection instanceof import_chunk_YF2AQ7KP.CollectionType ? getCollectionGraphNodePartials({
     collection,
     space,
     resolve,
@@ -410,22 +421,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   const actions = [];
   if (hasPendingMigration) {
     actions.push({
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.MIGRATE),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.Migrate._tag),
       type: import_plugin_graph2.ACTION_GROUP_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.MIGRATE,
-          data: {
-            space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Migrate, {
+          space
+        }));
       },
       properties: {
         label: [
           "migrate space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--database--regular",
@@ -437,22 +444,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   if (state === import_echo5.SpaceState.SPACE_READY && !hasPendingMigration) {
     const locked = space.properties[COMPOSER_SPACE_LOCK];
     actions.push({
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_OBJECT),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_OBJECT,
-          data: {
-            target: space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject, {
+          target: space
+        }));
       },
       properties: {
         label: [
           "create object in space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--plus--regular",
@@ -460,25 +463,21 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         testId: "spacePlugin.createObject"
       }
     }, {
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.SHARE),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.Share._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
         if (locked) {
           return;
         }
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.SHARE,
-          data: {
-            space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Share, {
+          space
+        }));
       },
       properties: {
         label: [
           "share space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--users--regular",
@@ -489,44 +488,42 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         }
       }
     }, {
-      id: locked ? getId(import_chunk_QNVEU2UD.SpaceAction.UNLOCK) : getId(import_chunk_QNVEU2UD.SpaceAction.LOCK),
+      id: locked ? getId(import_chunk_YF2AQ7KP.SpaceAction.Unlock._tag) : getId(import_chunk_YF2AQ7KP.SpaceAction.Lock._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: locked ? import_chunk_QNVEU2UD.SpaceAction.UNLOCK : import_chunk_QNVEU2UD.SpaceAction.LOCK,
-          data: {
+        if (locked) {
+          await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Unlock, {
             space
-          }
-        });
+          }));
+        } else {
+          await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Lock, {
+            space
+          }));
+        }
       },
       properties: {
         label: [
           locked ? "unlock space label" : "lock space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: locked ? "ph--lock-simple-open--regular" : "ph--lock-simple--regular"
       }
     }, {
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.RENAME),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.Rename._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async (params) => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.RENAME,
-          data: {
-            space,
-            ...params
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Rename, {
+          space,
+          caller: params.caller
+        }));
       },
       properties: {
         label: [
           "rename space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--pencil-simple-line--regular",
@@ -536,22 +533,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
         }
       }
     }, {
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.OPEN_SETTINGS),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.OpenSettings._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.OPEN_SETTINGS,
-          data: {
-            space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.OpenSettings, {
+          space
+        }));
       },
       properties: {
         label: [
           "open space settings label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--gear--regular"
@@ -560,22 +553,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   }
   if (state !== import_echo5.SpaceState.SPACE_INACTIVE && !hasPendingMigration) {
     actions.push({
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.CLOSE),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.Close._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.CLOSE,
-          data: {
-            space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Close, {
+          space
+        }));
       },
       properties: {
         label: [
           "close space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--x--regular",
@@ -585,22 +574,18 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   }
   if (state === import_echo5.SpaceState.SPACE_INACTIVE) {
     actions.push({
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.OPEN),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.Open._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
-        await dispatch({
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.OPEN,
-          data: {
-            space
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Open, {
+          space
+        }));
       },
       properties: {
         label: [
           "open space label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--clock-counter-clockwise--regular",
@@ -611,7 +596,7 @@ var constructSpaceActions = ({ space, dispatch, personal, migrating }) => {
   return actions;
 };
 var createObjectNode = ({ object, space, navigable = false, resolve }) => {
-  const type = (0, import_echo_schema3.getTypename)(object);
+  const type = (0, import_echo_schema2.getTypename)(object);
   if (!type) {
     return void 0;
   }
@@ -619,7 +604,7 @@ var createObjectNode = ({ object, space, navigable = false, resolve }) => {
   if (Object.keys(metadata).length === 0) {
     return void 0;
   }
-  const partials = object instanceof import_chunk_6SNOZF7Y.CollectionType ? getCollectionGraphNodePartials({
+  const partials = object instanceof import_chunk_YF2AQ7KP.CollectionType ? getCollectionGraphNodePartials({
     collection: object,
     space,
     resolve,
@@ -639,7 +624,7 @@ var createObjectNode = ({ object, space, navigable = false, resolve }) => {
       label: metadata.label?.(object) || object.name || metadata.placeholder || [
         "unnamed object label",
         {
-          ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+          ns: import_chunk_46S3JOES.SPACE_PLUGIN
         }
       ],
       icon: metadata.icon ?? "ph--placeholder--regular",
@@ -653,24 +638,20 @@ var constructObjectActions = ({ node, dispatch }) => {
   const object = node.data;
   const getId = (id) => `${id}/${(0, import_echo5.fullyQualifiedId)(object)}`;
   const actions = [
-    ...object instanceof import_chunk_6SNOZF7Y.CollectionType ? [
+    ...object instanceof import_chunk_YF2AQ7KP.CollectionType ? [
       {
-        id: getId(import_chunk_QNVEU2UD.SpaceAction.ADD_OBJECT),
+        id: getId(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject._tag),
         type: import_plugin_graph2.ACTION_TYPE,
         data: async () => {
-          await dispatch({
-            plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-            action: import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_OBJECT,
-            data: {
-              target: object
-            }
-          });
+          await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject, {
+            target: object
+          }));
         },
         properties: {
           label: [
             "create object in collection label",
             {
-              ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+              ns: import_chunk_46S3JOES.SPACE_PLUGIN
             }
           ],
           icon: "ph--plus--regular",
@@ -680,22 +661,19 @@ var constructObjectActions = ({ node, dispatch }) => {
       }
     ] : [],
     {
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.RENAME_OBJECT),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.RenameObject._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async (params) => {
-        await dispatch({
-          action: import_chunk_QNVEU2UD.SpaceAction.RENAME_OBJECT,
-          data: {
-            object,
-            ...params
-          }
-        });
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.RenameObject, {
+          object,
+          caller: params.caller
+        }));
       },
       properties: {
         label: [
-          object instanceof import_chunk_6SNOZF7Y.CollectionType ? "rename collection label" : "rename object label",
+          object instanceof import_chunk_YF2AQ7KP.CollectionType ? "rename collection label" : "rename object label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--pencil-simple-line--regular",
@@ -705,34 +683,29 @@ var constructObjectActions = ({ node, dispatch }) => {
       }
     },
     {
-      id: getId(import_chunk_QNVEU2UD.SpaceAction.REMOVE_OBJECTS),
+      id: getId(import_chunk_YF2AQ7KP.SpaceAction.RemoveObjects._tag),
       type: import_plugin_graph2.ACTION_TYPE,
       data: async () => {
         const graph = (0, import_plugin_graph2.getGraph)(node);
         const collection = graph.nodes(node, {
           relation: "inbound"
-        }).find(({ data }) => data instanceof import_chunk_6SNOZF7Y.CollectionType)?.data;
-        await dispatch([
-          {
-            action: import_chunk_QNVEU2UD.SpaceAction.REMOVE_OBJECTS,
-            data: {
-              objects: [
-                object
-              ],
-              collection
-            }
-          }
-        ]);
+        }).find(({ data }) => data instanceof import_chunk_YF2AQ7KP.CollectionType)?.data;
+        await dispatch((0, import_app_framework4.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.RemoveObjects, {
+          objects: [
+            object
+          ],
+          target: collection
+        }));
       },
       properties: {
         label: [
-          object instanceof import_chunk_6SNOZF7Y.CollectionType ? "delete collection label" : "delete object label",
+          object instanceof import_chunk_YF2AQ7KP.CollectionType ? "delete collection label" : "delete object label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--trash--regular",
-        keyBinding: object instanceof import_chunk_6SNOZF7Y.CollectionType ? void 0 : "shift+meta+Backspace",
+        keyBinding: object instanceof import_chunk_YF2AQ7KP.CollectionType ? void 0 : "shift+meta+Backspace",
         testId: "spacePlugin.deleteObject"
       }
     },
@@ -747,12 +720,32 @@ var constructObjectActions = ({ node, dispatch }) => {
         label: [
           "copy link label",
           {
-            ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
           }
         ],
         icon: "ph--link--regular",
         testId: "spacePlugin.copyLink"
       }
+    },
+    // TODO(wittjosiah): Factor out and apply to all nodes.
+    {
+      id: import_app_framework4.NavigationAction.Expose._tag,
+      type: import_plugin_graph2.ACTION_TYPE,
+      data: async () => {
+        await dispatch((0, import_app_framework4.createIntent)(import_app_framework4.NavigationAction.Expose, {
+          id: (0, import_echo5.fullyQualifiedId)(object)
+        }));
+      },
+      properties: {
+        label: [
+          "expose object label",
+          {
+            ns: import_chunk_46S3JOES.SPACE_PLUGIN
+          }
+        ],
+        icon: "ph--eye--regular",
+        testId: "spacePlugin.exposeObject"
+      }
     }
   ];
   return actions;
@@ -768,7 +761,7 @@ var getActiveSpace = (graph, active) => {
   return (0, import_echo5.getSpace)(node.data);
 };
 var getNestedObjects = async (object, resolve) => {
-  const type = (0, import_echo_schema3.getTypename)(object);
+  const type = (0, import_echo_schema2.getTypename)(object);
   if (!type) {
     return [];
   }
@@ -786,12 +779,12 @@ var getNestedObjects = async (object, resolve) => {
 };
 var cloneObject = async (object, resolve, newSpace) => {
   const schema = (0, import_live_object2.getSchema)(object);
-  const typename = schema ? (0, import_echo_schema3.getObjectAnnotation)(schema)?.typename ?? import_echo_schema3.EXPANDO_TYPENAME : import_echo_schema3.EXPANDO_TYPENAME;
+  const typename = schema ? (0, import_echo_schema2.getObjectAnnotation)(schema)?.typename ?? import_echo_schema2.EXPANDO_TYPENAME : import_echo_schema2.EXPANDO_TYPENAME;
   const metadata = resolve(typename);
   const serializer = metadata.serializer;
   (0, import_invariant2.invariant)(serializer, `No serializer for type: ${typename}`, {
     F: __dxlog_file,
-    L: 544,
+    L: 551,
     S: void 0,
     A: [
       "serializer",
@@ -808,11 +801,11 @@ var cloneObject = async (object, resolve, newSpace) => {
   });
 };
 var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: initialTarget, name: initialName, defaultSpaceId, resolve, onCreateObject }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const [typename, setTypename] = (0, import_react6.useState)(initialTypename);
   const [target, setTarget] = (0, import_react6.useState)(initialTarget);
-  const schema = schemas.find((schema2) => (0, import_echo_schema2.getObjectAnnotation)(schema2)?.typename === typename);
-  const options = schemas.map(import_echo_schema2.getObjectAnnotation).filter(import_util2.nonNullable);
+  const schema = schemas.find((schema2) => (0, import_echo_schema.getObjectAnnotation)(schema2)?.typename === typename);
+  const options = schemas.map(import_echo_schema.getObjectAnnotation).filter(import_util2.nonNullable);
   const handleClearSchema = (0, import_react6.useCallback)(() => setTypename(void 0), []);
   const handleClearTarget = (0, import_react6.useCallback)(() => setTarget(void 0), []);
   const handleCreateObject = (0, import_react6.useCallback)(async ({ name }) => {
@@ -831,7 +824,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
   ]);
   const schemaInput = /* @__PURE__ */ import_react6.default.createElement(import_react_ui_searchlist.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__ */ import_react6.default.createElement(import_react_ui_searchlist.SearchList.Input, {
     autoFocus: true,
     "data-testid": "create-object-form.schema-input",
@@ -858,7 +851,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
   }))))));
   const spaceInput = /* @__PURE__ */ import_react6.default.createElement(import_react_ui_searchlist.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__ */ import_react6.default.createElement(import_react_ui_searchlist.SearchList.Input, {
     autoFocus: true,
     "data-testid": "create-object-form.space-input",
@@ -883,8 +876,8 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     values: {
       name: initialName
     },
-    schema: import_echo_schema2.S.Struct({
-      name: import_echo_schema2.S.optional(import_echo_schema2.S.String)
+    schema: import_echo_schema.S.Struct({
+      name: import_echo_schema.S.optional(import_echo_schema.S.String)
     }),
     testId: "create-object-form",
     onSave: handleCreateObject
@@ -893,8 +886,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     role: "form",
     className: "flex flex-col gap-2"
   }, target && /* @__PURE__ */ import_react6.default.createElement("div", {
-    role: "none",
-    className: "px-2"
+    role: "none"
   }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Input.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui_form.InputHeader, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Input.Label, null, t((0, import_echo4.isSpace)(target) ? "creating in space label" : "creating in collection label"))), /* @__PURE__ */ import_react6.default.createElement("div", {
     role: "none",
     className: "flex gap-2"
@@ -909,8 +901,7 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     label: t("clear input label"),
     onClick: handleClearTarget
   })))), schema && /* @__PURE__ */ import_react6.default.createElement("div", {
-    role: "none",
-    className: "px-2"
+    role: "none"
   }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Input.Root, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui_form.InputHeader, null, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Input.Label, null, t("creating object type label"))), /* @__PURE__ */ import_react6.default.createElement("div", {
     role: "none",
     className: "flex gap-2"
@@ -927,44 +918,37 @@ var CreateObjectPanel = ({ schemas, spaces, typename: initialTypename, target: i
     onClick: handleClearSchema
   })))), !schema ? schemaInput : !target ? spaceInput : form);
 };
-var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollections, resolve }) => {
+var CREATE_OBJECT_DIALOG = `${import_chunk_46S3JOES.SPACE_PLUGIN}/CreateObjectDialog`;
+var CreateObjectDialog = ({ schemas, target, typename, name, shouldNavigate: _shouldNavigate, resolve }) => {
   const closeRef = (0, import_react5.useRef)(null);
-  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui2.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client3.useClient)();
   const spaces = (0, import_echo3.useSpaces)();
-  const dispatch = (0, import_app_framework3.useIntentDispatcher)();
+  const { dispatchPromise: dispatch } = (0, import_app_framework3.useIntentDispatcher)();
   const handleCreateObject = (0, import_react5.useCallback)(async ({ schema, target: _target, name: name2 }) => {
-    const target2 = (0, import_echo3.isSpace)(_target) ? _target.properties[import_chunk_6SNOZF7Y.CollectionType.typename] : _target;
-    const createObjectAction = resolve?.(schema.typename)?.createObject;
-    if (!createObjectAction || !target2) {
+    const target2 = (0, import_echo3.isSpace)(_target) ? _target.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target : _target;
+    const createObjectIntent = resolve?.(schema.typename)?.createObject;
+    if (!createObjectIntent || !target2) {
       return;
     }
     closeRef.current?.click();
     const space = (0, import_echo3.isSpace)(target2) ? target2 : (0, import_echo3.getSpace)(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 ((0, import_echo3.isReactiveObject)(object)) {
-      await dispatch([
-        {
-          plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-          action: import_chunk_QNVEU2UD.SpaceAction.ADD_OBJECT,
-          data: {
-            target: target2,
-            object
-          }
-        },
-        ...!(object instanceof import_chunk_6SNOZF7Y.CollectionType) || navigableCollections ? [
-          {
-            action: import_app_framework3.NavigationAction.OPEN
-          }
-        ] : []
-      ]);
+      const addObjectIntent = (0, import_app_framework3.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.AddObject, {
+        target: target2,
+        object
+      });
+      const shouldNavigate = _shouldNavigate ?? (() => true);
+      if (shouldNavigate(object)) {
+        await dispatch((0, import_effect.pipe)(addObjectIntent, (0, import_app_framework3.chain)(import_app_framework3.NavigationAction.Open, {})));
+      } else {
+        await dispatch(addObjectIntent);
+      }
     }
   }, [
     dispatch,
@@ -977,7 +961,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__ */ import_react5.default.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__ */ import_react5.default.createElement(import_react_ui2.Dialog.Title, null, t("create object dialog title")), /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Dialog.Close, {
       asChild: true
     }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui2.Button, {
@@ -1002,26 +986,21 @@ var CreateObjectDialog = ({ schemas, target, typename, name, navigableCollection
     })))
   );
 };
+var CREATE_SPACE_DIALOG = `${import_chunk_46S3JOES.SPACE_PLUGIN}/CreateSpaceDialog`;
 var initialValues = {
   edgeReplication: true
 };
 var CreateSpaceDialog = () => {
   const closeRef = (0, import_react7.useRef)(null);
-  const { t } = (0, import_react_ui4.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const dispatch = (0, import_app_framework4.useIntentDispatcher)();
+  const { t } = (0, import_react_ui4.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = (0, import_app_framework5.useIntentDispatcher)();
   const handleCreateSpace = (0, import_react7.useCallback)(async (data) => {
-    const result = await dispatch({
-      action: import_chunk_QNVEU2UD.SpaceAction.CREATE,
-      data
-    });
-    const target = result?.data.space;
+    const result = await dispatch((0, import_app_framework5.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Create, data));
+    const target = result.data?.space;
     if (target) {
-      await dispatch({
-        action: import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_OBJECT,
-        data: {
-          target
-        }
-      });
+      await dispatch((0, import_app_framework5.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject, {
+        target
+      }));
     }
   }, [
     dispatch
@@ -1033,7 +1012,7 @@ var CreateSpaceDialog = () => {
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
     }, /* @__PURE__ */ import_react7.default.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__ */ import_react7.default.createElement(import_react_ui4.Dialog.Title, null, t("create space dialog title")), /* @__PURE__ */ import_react7.default.createElement(import_react_ui4.Dialog.Close, {
       asChild: true
     }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui4.Button, {
@@ -1049,13 +1028,13 @@ var CreateSpaceDialog = () => {
     }, /* @__PURE__ */ import_react7.default.createElement(import_react_ui_form2.Form, {
       testId: "create-space-form",
       values: initialValues,
-      schema: import_chunk_6SNOZF7Y.SpaceForm,
+      schema: import_chunk_YF2AQ7KP.SpaceForm,
       onSave: handleCreateSpace
     })))
   );
 };
 var CollectionMain = ({ collection }) => {
-  const { t } = (0, import_react_ui5.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui5.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   return /* @__PURE__ */ import_react8.default.createElement("div", {
     role: "none",
     className: (0, import_react_ui_theme2.mx)(import_react_ui_theme2.baseSurface, "min-bs-screen is-full flex items-center justify-center p-8"),
@@ -1066,7 +1045,7 @@ var CollectionMain = ({ collection }) => {
   }, collection.name ?? t("unnamed collection label")));
 };
 var CollectionSection = ({ collection }) => {
-  const { t } = (0, import_react_ui6.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui6.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   return /* @__PURE__ */ import_react9.default.createElement("div", {
     className: "min-bs-[3.5rem] grid grid-rows-subgrid grid-cols-subgrid items-center"
   }, /* @__PURE__ */ import_react9.default.createElement("span", {
@@ -1074,7 +1053,7 @@ var CollectionSection = ({ collection }) => {
   }, collection.name ?? t("unnamed collection label")));
 };
 var DefaultObjectSettings = ({ object }) => {
-  const { t } = (0, import_react_ui7.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui7.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   return /* @__PURE__ */ import_react10.default.createElement("div", {
     role: "form",
     className: "flex flex-col w-full p-2 gap-1"
@@ -1086,33 +1065,28 @@ var DefaultObjectSettings = ({ object }) => {
     }
   })));
 };
+var JOIN_DIALOG = `${import_chunk_46S3JOES.SPACE_PLUGIN}/JoinDialog`;
 var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
-  const { t } = (0, import_react_ui8.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const dispatch = (0, import_app_framework5.useIntentDispatcher)();
+  const { t } = (0, import_react_ui8.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = (0, import_app_framework6.useIntentDispatcher)();
   const spaces = (0, import_echo6.useSpaces)();
   const { graph } = (0, import_plugin_graph3.useGraph)();
   const handleDone = (0, import_react11.useCallback)(async (result) => {
     if (result?.spaceKey) {
       await Promise.all([
-        dispatch({
-          action: import_app_framework5.LayoutAction.SET_LAYOUT,
-          data: {
-            element: "toast",
-            subject: {
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/join-success`,
-              duration: 5e3,
-              title: t("join success label"),
-              closeLabel: t("dismiss label")
-            }
-          }
-        }),
-        dispatch({
-          action: import_app_framework5.LayoutAction.SET_LAYOUT,
-          data: {
-            element: "dialog",
-            state: false
+        dispatch((0, import_app_framework6.createIntent)(import_app_framework6.LayoutAction.SetLayout, {
+          element: "toast",
+          subject: {
+            id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/join-success`,
+            duration: 5e3,
+            title: t("join success label"),
+            closeLabel: t("dismiss label")
           }
-        })
+        })),
+        dispatch((0, import_app_framework6.createIntent)(import_app_framework6.LayoutAction.SetLayout, {
+          element: "dialog",
+          state: false
+        }))
       ]);
     }
     const space = spaces.find(({ key }) => result?.spaceKey?.equals(key));
@@ -1123,35 +1097,26 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
       }).catch(() => {
       });
       await Promise.all([
-        dispatch({
-          action: import_app_framework5.NavigationAction.OPEN,
-          data: {
-            activeParts: {
-              main: [
-                target
-              ]
-            }
-          }
-        }),
-        dispatch({
-          action: import_app_framework5.NavigationAction.EXPOSE,
-          data: {
-            id: target
+        dispatch((0, import_app_framework6.createIntent)(import_app_framework6.NavigationAction.Open, {
+          activeParts: {
+            main: [
+              target
+            ]
           }
-        })
+        })),
+        dispatch((0, import_app_framework6.createIntent)(import_app_framework6.NavigationAction.Expose, {
+          id: target
+        }))
       ]);
     }
     await onDone?.(result);
     if (space) {
-      await dispatch({
-        action: import_meta2.ObservabilityAction.SEND_EVENT,
-        data: {
-          name: "space.join",
-          properties: {
-            spaceId: space.id
-          }
+      await dispatch((0, import_app_framework6.createIntent)(import_types3.ObservabilityAction.SendEvent, {
+        name: "space.join",
+        properties: {
+          spaceId: space.id
         }
-      });
+      }));
     }
   }, [
     dispatch,
@@ -1169,7 +1134,7 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
   }));
 };
 var MenuFooter = ({ object }) => {
-  const { t } = (0, import_react_ui9.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui9.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client4.useClient)();
   const space = (0, import_echo7.getSpace)(object);
   const spaceName = space ? getSpaceDisplayName(space, {
@@ -1192,7 +1157,7 @@ var Status;
   Status2[Status2["ERROR"] = 2] = "ERROR";
 })(Status || (Status = {}));
 var PersistenceStatus = ({ db }) => {
-  const { t } = (0, import_react_ui10.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui10.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const [displayMessage, setDisplayMessage] = (0, import_react16.useState)(false);
   const [status, naturalSetStatus] = (0, import_react16.useState)(0);
   const [prevStatus, setPrevStatus] = (0, import_react16.useState)(0);
@@ -1235,14 +1200,13 @@ var PersistenceStatus = ({ db }) => {
         className: (0, import_react_ui_theme3.mx)((0, import_react_ui_theme3.getSize)(4), "me-1")
       }), displayMessage && /* @__PURE__ */ import_react16.default.createElement("span", {
         className: (0, import_react_ui_theme3.mx)("text-sm", import_react_ui_theme3.staticPlaceholderText)
-      }, t("persisted locally label"))), /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Portal, null, /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Content, {
-        classNames: "z-10"
-      }, t("persisted locally message"), /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Arrow, null))));
+      }, t("persisted locally label"))), /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Portal, null, /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Content, null, t("persisted locally message"), /* @__PURE__ */ import_react16.default.createElement(import_react_ui10.Tooltip.Arrow, null))));
   }
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx";
+var POPOVER_RENAME_OBJECT = `${import_chunk_46S3JOES.SPACE_PLUGIN}/PopoverRenameObject`;
 var PopoverRenameObject = ({ object: obj }) => {
-  const { t } = (0, import_react_ui11.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui11.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const doneButton = (0, import_react17.useRef)(null);
   const object = obj;
   const [name, setName] = (0, import_react17.useState)(object.name || object.title || "");
@@ -1257,7 +1221,7 @@ var PopoverRenameObject = ({ object: obj }) => {
           err
         }, {
           F: __dxlog_file2,
-          L: 28,
+          L: 30,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1291,8 +1255,9 @@ var PopoverRenameObject = ({ object: obj }) => {
     ns: "os"
   }))));
 };
+var POPOVER_RENAME_SPACE = `${import_chunk_46S3JOES.SPACE_PLUGIN}/PopoverRenameSpace`;
 var PopoverRenameSpace = ({ space }) => {
-  const { t } = (0, import_react_ui12.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui12.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const doneButton = (0, import_react18.useRef)(null);
   const [name, setName] = (0, import_react18.useState)(space.properties.name ?? "");
   const handleDone = (0, import_react18.useCallback)(() => {
@@ -1327,18 +1292,15 @@ var PopoverRenameSpace = ({ space }) => {
   }))));
 };
 var ShareSpaceButton = ({ space }) => {
-  const dispatch = (0, import_app_framework6.useIntentDispatcher)();
+  const { dispatchPromise: dispatch } = (0, import_app_framework7.useIntentDispatcher)();
   return /* @__PURE__ */ import_react19.default.createElement(ShareSpaceButtonImpl, {
-    onClick: () => dispatch({
-      action: import_chunk_QNVEU2UD.SpaceAction.SHARE,
-      data: {
-        space
-      }
-    })
+    onClick: () => dispatch((0, import_app_framework7.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Share, {
+      space
+    }))
   });
 };
 var ShareSpaceButtonImpl = ({ onClick }) => {
-  const { t } = (0, import_react_ui13.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui13.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   return /* @__PURE__ */ import_react19.default.createElement(import_react_ui13.IconButton, {
     "data-testid": "spacePlugin.shareSpaceButton",
     icon: "ph--users--regular",
@@ -1346,12 +1308,45 @@ var ShareSpaceButtonImpl = ({ onClick }) => {
     onClick
   });
 };
+var usePath = (graph, id, timeout) => {
+  const [pathState, setPathState] = (0, import_react21.useState)(id ? graph.getPath({
+    target: id
+  }) : void 0);
+  (0, import_react21.useEffect)(() => {
+    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;
+};
 var REFRESH_INTERVAL = 5e3;
 var ACTIVITY_DURATION = 3e4;
 var noViewers = new import_util3.ComplexMap(import_react_client5.PublicKey.hash);
 var getName = (identity) => identity.profile?.displayName ?? (0, import_display_name.generateName)(identity.identityKey.toHex());
 var SpacePresence = ({ object, spaceKey }) => {
-  const spacePlugin = (0, import_app_framework7.usePlugin)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const spacePlugin = (0, import_app_framework8.usePlugin)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client5.useClient)();
   const identity = (0, import_halo.useIdentity)();
   const space = spaceKey ? client.spaces.get(spaceKey) : (0, import_echo8.getSpace)(object);
@@ -1449,10 +1444,17 @@ 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 } = (0, import_react_ui_attention.useAttention)(id);
+  const isAttended = hasAttention || isAncestor || isRelated;
+  const { graph } = (0, import_plugin_graph4.useGraph)();
+  const attended = (0, import_react_ui_attention.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] = (0, import_react20.useState)(viewers ? getActiveViewers(viewers) : []);
   (0, import_react20.useEffect)(() => {
@@ -1467,58 +1469,50 @@ var SmallPresenceLive = ({ id, viewers }) => {
     viewers
   ]);
   return /* @__PURE__ */ import_react20.default.createElement(SmallPresence, {
-    id,
-    count: activeViewers.length
+    count: activeViewers.length,
+    attended: isAttended,
+    containsAttended
   });
 };
-var SmallPresence = ({ id, count }) => {
-  const { t } = (0, import_react_ui14.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const { hasAttention, isAncestor, isRelated } = (0, import_react_ui_attention.useAttention)(id);
-  const attention = hasAttention || isAncestor || isRelated;
+var SmallPresence = ({ count = 0, attended, containsAttended }) => {
+  const { t } = (0, import_react_ui14.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   return /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Root, null, /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Trigger, {
     asChild: true
-  }, /* @__PURE__ */ import_react20.default.createElement("div", {
-    role: "none",
-    className: "flex",
-    "data-attention": attention
   }, /* @__PURE__ */ import_react20.default.createElement(import_react_ui_attention.AttentionGlyph, {
+    attended,
+    containsAttended,
     presence: count > 1 ? "many" : count === 1 ? "one" : "none",
     classNames: "self-center mie-1"
-  }))), /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Portal, null, /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Content, {
-    side: "bottom",
-    classNames: "z-[70]"
+  })), /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Portal, null, /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Content, {
+    side: "bottom"
   }, /* @__PURE__ */ import_react20.default.createElement("span", null, t("presence label", {
     count
   })), /* @__PURE__ */ import_react20.default.createElement(import_react_ui14.Tooltip.Arrow, null))));
 };
 var SpacePluginSettings = ({ settings }) => {
-  const { t } = (0, import_react_ui15.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const dispatch = (0, import_app_framework8.useIntentDispatcher)();
-  return /* @__PURE__ */ import_react21.default.createElement(import_react21.default.Fragment, null, /* @__PURE__ */ import_react21.default.createElement(import_react_ui_form3.DeprecatedFormInput, {
+  const { t } = (0, import_react_ui15.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
+  const { dispatchPromise: dispatch } = (0, import_app_framework9.useIntentDispatcher)();
+  return /* @__PURE__ */ import_react22.default.createElement(import_react22.default.Fragment, null, /* @__PURE__ */ import_react22.default.createElement(import_react_ui_form3.DeprecatedFormInput, {
     label: t("show hidden spaces label")
-  }, /* @__PURE__ */ import_react21.default.createElement(import_react_ui15.Input.Switch, {
+  }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui15.Input.Switch, {
     checked: settings.showHidden,
-    onCheckedChange: (checked) => dispatch({
-      plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-      action: import_chunk_QNVEU2UD.SpaceAction.TOGGLE_HIDDEN,
-      data: {
-        state: !!checked
-      }
-    })
+    onCheckedChange: (checked) => dispatch((0, import_app_framework9.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.ToggleHidden, {
+      state: !!checked
+    }))
   })));
 };
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsPanel.tsx";
-var SpaceSettingsPanel = ({ space }) => {
-  const { t } = (0, import_react_ui17.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+var SpaceSettingsPanel = ({ classNames, space }) => {
+  const { t } = (0, import_react_ui17.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client7.useClient)();
   const edgeEnabled = Boolean(client.config.values.runtime?.client?.edgeFeatures?.echoReplicator);
-  const [edgeReplication, setEdgeReplication] = (0, import_react24.useState)(space.internal.data.edgeReplication === import_metadata2.EdgeReplicationSetting.ENABLED);
-  const toggleEdgeReplication = (0, import_react24.useCallback)(async (next) => {
+  const [edgeReplication, setEdgeReplication] = (0, import_react25.useState)(space.internal.data.edgeReplication === import_metadata2.EdgeReplicationSetting.ENABLED);
+  const toggleEdgeReplication = (0, import_react25.useCallback)(async (next) => {
     setEdgeReplication(next);
     await space?.internal.setEdgeReplicationPreference(next ? import_metadata2.EdgeReplicationSetting.ENABLED : import_metadata2.EdgeReplicationSetting.DISABLED).catch((err) => {
       import_log3.log.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 35,
+        L: 36,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1527,29 +1521,30 @@ var SpaceSettingsPanel = ({ space }) => {
   }, [
     space
   ]);
-  return /* @__PURE__ */ import_react24.default.createElement("div", {
+  return /* @__PURE__ */ import_react25.default.createElement("div", {
     role: "form",
-    className: "flex flex-col"
-  }, /* @__PURE__ */ import_react24.default.createElement(import_react_ui_form4.DeprecatedFormInput, {
+    className: (0, import_react_ui_theme4.mx)("flex flex-col", classNames)
+  }, /* @__PURE__ */ import_react25.default.createElement(import_react_ui_form4.DeprecatedFormInput, {
     label: t("name label")
-  }, /* @__PURE__ */ import_react24.default.createElement(import_react_ui17.Input.TextInput, {
+  }, /* @__PURE__ */ import_react25.default.createElement(import_react_ui17.Input.TextInput, {
     placeholder: t("unnamed space label"),
     value: space.properties.name ?? "",
     onChange: (event) => {
       space.properties.name = event.target.value;
     }
-  })), edgeEnabled && /* @__PURE__ */ import_react24.default.createElement(import_react_ui_form4.DeprecatedFormInput, {
+  })), edgeEnabled && /* @__PURE__ */ import_react25.default.createElement(import_react_ui_form4.DeprecatedFormInput, {
     label: t("edge replication label")
-  }, /* @__PURE__ */ import_react24.default.createElement(import_react_ui17.Input.Switch, {
+  }, /* @__PURE__ */ import_react25.default.createElement(import_react_ui17.Input.Switch, {
     checked: edgeReplication,
     onCheckedChange: toggleEdgeReplication
   })));
 };
+var SPACE_SETTINGS_DIALOG = `${import_chunk_46S3JOES.SPACE_PLUGIN}/SpaceSettingsDialog`;
 var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "members", namesCache }) => {
-  const { t } = (0, import_react_ui16.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui16.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client6.useClient)();
-  const [tabsActivePart, setTabsActivePart] = (0, import_react22.useState)("list");
-  const [selected, setSelected] = (0, import_react22.useState)(initialTab);
+  const [tabsActivePart, setTabsActivePart] = (0, import_react23.useState)("list");
+  const [selected, setSelected] = (0, import_react23.useState)(initialTab);
   const locked = space.properties[COMPOSER_SPACE_LOCK];
   const name = getSpaceDisplayName(space, {
     personal: client.spaces.default === space,
@@ -1558,64 +1553,64 @@ var SpaceSettingsDialog = ({ space, target, createInvitationUrl, initialTab = "m
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
-    /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Dialog.Content, {
+    /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Dialog.Content, {
       classNames: "p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden"
-    }, /* @__PURE__ */ import_react22.default.createElement("div", {
+    }, /* @__PURE__ */ import_react23.default.createElement("div", {
       role: "none",
-      className: "flex justify-between pbs-3 pis-2 pie-3 @md:pbs-4 @md:pis-4 @md:pie-5"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Dialog.Title, {
+      className: "flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4"
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Dialog.Title, {
       onClick: () => setTabsActivePart("list"),
       "aria-description": t("click to return to tablist description"),
       classNames: "flex cursor-pointer items-center group/title"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Icon, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Icon, {
       icon: "ph--caret-left--regular",
       size: 4,
       classNames: [
         "@md:hidden",
         tabsActivePart === "list" && "invisible"
       ]
-    }), /* @__PURE__ */ import_react22.default.createElement("span", {
+    }), /* @__PURE__ */ import_react23.default.createElement("span", {
       className: tabsActivePart !== "list" ? "group-hover/title:underline @md:group-hover/title:no-underline underline-offset-4 decoration-1" : ""
-    }, (0, import_react_ui16.toLocalizedString)(name, t))), /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Dialog.Close, {
+    }, (0, import_react_ui16.toLocalizedString)(name, t))), /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Dialog.Close, {
       asChild: true
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Button, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Button, {
       density: "fine",
       variant: "ghost",
       autoFocus: true
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Icon, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Icon, {
       icon: "ph--x--regular",
       size: 4
-    })))), /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Root, {
+    })))), /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Root, {
       orientation: "vertical",
       value: selected,
       onValueChange: setSelected,
       activePart: tabsActivePart,
       onActivePartChange: setTabsActivePart,
       classNames: "flex flex-col flex-1 mbs-2"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Viewport, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Viewport, {
       classNames: "flex-1 min-bs-0"
-    }, /* @__PURE__ */ import_react22.default.createElement("div", {
+    }, /* @__PURE__ */ import_react23.default.createElement("div", {
       role: "none",
       className: "overflow-y-auto pli-3 @md:pis-2 @md:pie-0 mbe-4 border-r border-separator"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Tablist, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Tablist, {
       classNames: "flex flex-col max-bs-none min-is-[200px] gap-4 overflow-y-auto"
-    }, /* @__PURE__ */ import_react22.default.createElement("div", {
+    }, /* @__PURE__ */ import_react23.default.createElement("div", {
       role: "none",
       className: "flex flex-col ml-1"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Tab, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Tab, {
       value: "settings"
-    }, t("settings tab label")), /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Tab, {
+    }, t("settings tab label")), /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Tab, {
       value: "members",
       disabled: locked
-    }, t("members tab label"))))), /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Tabpanel, {
+    }, t("members tab label"))))), /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Tabpanel, {
       value: "settings",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ import_react22.default.createElement(SpaceSettingsPanel, {
+    }, /* @__PURE__ */ import_react23.default.createElement(SpaceSettingsPanel, {
       space
-    })), /* @__PURE__ */ import_react22.default.createElement(import_react_ui_tabs.Tabs.Tabpanel, {
+    })), /* @__PURE__ */ import_react23.default.createElement(import_react_ui_tabs.Tabs.Tabpanel, {
       value: "members",
       classNames: "pli-3 @md:pli-5 max-bs-dvh overflow-y-auto"
-    }, /* @__PURE__ */ import_react22.default.createElement(import_react_ui16.Clipboard.Provider, null, /* @__PURE__ */ import_react22.default.createElement(import_react23.SpacePanel, {
+    }, /* @__PURE__ */ import_react23.default.createElement(import_react_ui16.Clipboard.Provider, null, /* @__PURE__ */ import_react23.default.createElement(import_react24.SpacePanel, {
       space,
       hideHeading: true,
       target,
@@ -1644,8 +1639,8 @@ var getSyncSummary = (syncMap) => {
 var isEdgePeerId = (peerId, spaceId) => peerId.startsWith(`${import_protocols.EdgeService.AUTOMERGE_REPLICATOR}:${spaceId}`);
 var useSyncState = () => {
   const client = (0, import_react_client9.useClient)();
-  const [spaceState, setSpaceState] = (0, import_react26.useState)({});
-  (0, import_react26.useEffect)(() => {
+  const [spaceState, setSpaceState] = (0, import_react27.useState)({});
+  (0, import_react27.useEffect)(() => {
     const ctx = new import_context.Context(void 0, {
       F: __dxlog_file4,
       L: 48
@@ -1679,8 +1674,8 @@ var useSyncState = () => {
   return spaceState;
 };
 var useSpaceSyncState = (space) => {
-  const [spaceState, setSpaceState] = (0, import_react26.useState)();
-  (0, import_react26.useEffect)(() => {
+  const [spaceState, setSpaceState] = (0, import_react27.useState)();
+  (0, import_react27.useEffect)(() => {
     const ctx = new import_context.Context(void 0, {
       F: __dxlog_file4,
       L: 87
@@ -1700,9 +1695,9 @@ var useSpaceSyncState = (space) => {
   return spaceState;
 };
 var useEdgeStatus = () => {
-  const [status, setStatus] = (0, import_react25.useState)(import_services.QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED);
+  const [status, setStatus] = (0, import_react26.useState)(import_services.QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED);
   const client = (0, import_react_client8.useClient)();
-  (0, import_react25.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     client.services.services.EdgeAgentService?.queryEdgeStatus().subscribe(({ status: status2 }) => {
       setStatus(status2);
     });
@@ -1711,31 +1706,31 @@ var useEdgeStatus = () => {
   ]);
   return status;
 };
-var InlineSyncStatus = ({ space }) => {
+var InlineSyncStatus = ({ space, open }) => {
+  const { t } = (0, import_react_ui18.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
+  const id = space.id;
+  const { hasAttention, isAncestor, isRelated } = (0, import_react_ui_attention2.useAttention)(id);
+  const isAttended = hasAttention || isAncestor || isRelated;
+  const { graph } = (0, import_plugin_graph5.useGraph)();
+  const attended = (0, import_react_ui_attention2.useAttended)();
+  const startOfAttention = attended.at(-1);
+  const path = usePath(graph, startOfAttention);
+  const containsAttended = !open && !isAttended && id && path ? path.includes(id) : false;
   const connectedToEdge = useEdgeStatus() === import_services.QueryEdgeStatusResponse.EdgeStatus.CONNECTED;
   const edgeSyncEnabled = space.internal.data.edgeReplication === import_metadata3.EdgeReplicationSetting.ENABLED;
   const syncState = useSpaceSyncState(space);
-  if (!connectedToEdge || !edgeSyncEnabled || !syncState || syncState.missingOnLocal === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ import_react25.default.createElement(InlineSyncStatusIndicator, null);
-};
-var InlineSyncStatusIndicator = () => {
-  const { t } = (0, import_react_ui18.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
-  const animationProps = (0, import_react25.useMemo)(() => ({
-    // Synchronize animations.
-    animationDelay: `-${Date.now() % 2e3}ms`
-  }), []);
-  return /* @__PURE__ */ import_react25.default.createElement("div", {
-    role: "status",
-    "aria-label": t("syncing message"),
-    className: "flex items-center"
-  }, /* @__PURE__ */ import_react25.default.createElement(import_react_ui18.Icon, {
-    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__ */ import_react26.default.createElement(import_react_ui18.Tooltip.Root, null, /* @__PURE__ */ import_react26.default.createElement(import_react_ui18.Tooltip.Trigger, {
+    asChild: true
+  }, /* @__PURE__ */ import_react26.default.createElement(import_react_ui_attention2.AttentionGlyph, {
+    syncing,
+    attended: isAttended,
+    containsAttended,
+    classNames: "self-center mie-1"
+  })), /* @__PURE__ */ import_react26.default.createElement(import_react_ui18.Tooltip.Portal, null, /* @__PURE__ */ import_react26.default.createElement(import_react_ui18.Tooltip.Content, {
+    side: "bottom",
+    classNames: "z-[70]"
+  }, /* @__PURE__ */ import_react26.default.createElement("span", null, t("syncing label")), /* @__PURE__ */ import_react26.default.createElement(import_react_ui18.Tooltip.Arrow, null))));
 };
 var SYNC_STALLED_TIMEOUT = 5e3;
 var styles = {
@@ -1744,9 +1739,9 @@ var styles = {
   barHover: "dark:hover:bg-green-500"
 };
 var useActive = (count) => {
-  const [current, setCurrent] = (0, import_react28.useState)(count);
-  const [active, setActive] = (0, import_react28.useState)(false);
-  (0, import_react28.useEffect)(() => {
+  const [current, setCurrent] = (0, import_react29.useState)(count);
+  const [active, setActive] = (0, import_react29.useState)(false);
+  (0, import_react29.useEffect)(() => {
     let t;
     if (count !== current) {
       setActive(true);
@@ -1767,7 +1762,7 @@ var useActive = (count) => {
   return active;
 };
 var SpaceRowContainer = ({ spaceId, state }) => {
-  const { t } = (0, import_react_ui20.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui20.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const client = (0, import_react_client11.useClient)();
   const space = (0, import_echo9.useSpace)(spaceId);
   if (!space) {
@@ -1776,7 +1771,7 @@ var SpaceRowContainer = ({ spaceId, state }) => {
   const spaceName = (0, import_react_ui20.toLocalizedString)(getSpaceDisplayName(space, {
     personal: space === client.spaces.default
   }), t);
-  return /* @__PURE__ */ import_react28.default.createElement(SpaceRow, {
+  return /* @__PURE__ */ import_react29.default.createElement(SpaceRow, {
     spaceId,
     spaceName,
     state
@@ -1785,19 +1780,19 @@ var SpaceRowContainer = ({ spaceId, state }) => {
 var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumentCount, missingOnLocal, missingOnRemote } }) => {
   const downActive = useActive(localDocumentCount);
   const upActive = useActive(remoteDocumentCount);
-  return /* @__PURE__ */ import_react28.default.createElement("div", {
+  return /* @__PURE__ */ import_react29.default.createElement("div", {
     className: "flex items-center mx-0.5 gap-0.5 cursor-pointer",
     title: spaceId,
     onClick: () => {
       void navigator.clipboard.writeText(spaceId);
     }
-  }, /* @__PURE__ */ import_react28.default.createElement("span", {
+  }, /* @__PURE__ */ import_react29.default.createElement("span", {
     className: "is-1/2 truncate"
-  }, spaceName), /* @__PURE__ */ import_react28.default.createElement(import_react_ui20.Icon, {
+  }, spaceName), /* @__PURE__ */ import_react29.default.createElement(import_react_ui20.Icon, {
     icon: "ph--arrow-fat-line-left--regular",
     size: 3,
-    classNames: (0, import_react_ui_theme5.mx)(downActive && "animate-[pulse_1s_infinite]")
-  }), /* @__PURE__ */ import_react28.default.createElement(Candle, {
+    classNames: (0, import_react_ui_theme6.mx)(downActive && "animate-[pulse_1s_infinite]")
+  }), /* @__PURE__ */ import_react29.default.createElement(Candle, {
     up: {
       count: remoteDocumentCount,
       total: remoteDocumentCount + missingOnRemote
@@ -1807,37 +1802,37 @@ var SpaceRow = ({ spaceId, spaceName, state: { localDocumentCount, remoteDocumen
       total: localDocumentCount + missingOnLocal
     },
     title: spaceId
-  }), /* @__PURE__ */ import_react28.default.createElement(import_react_ui20.Icon, {
+  }), /* @__PURE__ */ import_react29.default.createElement(import_react_ui20.Icon, {
     icon: "ph--arrow-fat-line-right--regular",
     size: 3,
-    classNames: (0, import_react_ui_theme5.mx)(upActive && "animate-[pulse_1s_step-start_infinite]")
+    classNames: (0, import_react_ui_theme6.mx)(upActive && "animate-[pulse_1s_step-start_infinite]")
   }));
 };
 var Candle = ({ classNames, up, down }) => {
-  return /* @__PURE__ */ import_react28.default.createElement("div", {
-    className: (0, import_react_ui_theme5.mx)("grid grid-cols-[1fr_2rem_1fr] w-full h-3", classNames)
-  }, /* @__PURE__ */ import_react28.default.createElement(Bar, {
+  return /* @__PURE__ */ import_react29.default.createElement("div", {
+    className: (0, import_react_ui_theme6.mx)("grid grid-cols-[1fr_2rem_1fr] w-full h-3", classNames)
+  }, /* @__PURE__ */ import_react29.default.createElement(Bar, {
     classNames: "justify-end",
     ...up
-  }), /* @__PURE__ */ import_react28.default.createElement("div", {
+  }), /* @__PURE__ */ import_react29.default.createElement("div", {
     className: "relative"
-  }, /* @__PURE__ */ import_react28.default.createElement("div", {
-    className: (0, import_react_ui_theme5.mx)("absolute inset-0 flex items-center justify-center text-xs", styles.barBg)
-  }, up.total)), /* @__PURE__ */ import_react28.default.createElement(Bar, down));
+  }, /* @__PURE__ */ import_react29.default.createElement("div", {
+    className: (0, import_react_ui_theme6.mx)("absolute inset-0 flex items-center justify-center text-xs", styles.barBg)
+  }, up.total)), /* @__PURE__ */ import_react29.default.createElement(Bar, down));
 };
 var Bar = ({ classNames, count, total }) => {
   let p = count / total * 100;
   if (count < total) {
     p = Math.min(p, 95);
   }
-  return /* @__PURE__ */ import_react28.default.createElement("div", {
-    className: (0, import_react_ui_theme5.mx)("relative flex w-full", styles.barBg, classNames)
-  }, /* @__PURE__ */ import_react28.default.createElement("div", {
-    className: (0, import_react_ui_theme5.mx)("shrink-0", styles.barFg),
+  return /* @__PURE__ */ import_react29.default.createElement("div", {
+    className: (0, import_react_ui_theme6.mx)("relative flex w-full", styles.barBg, classNames)
+  }, /* @__PURE__ */ import_react29.default.createElement("div", {
+    className: (0, import_react_ui_theme6.mx)("shrink-0", styles.barFg),
     style: {
       width: `${p}%`
     }
-  }), count !== total && /* @__PURE__ */ import_react28.default.createElement("div", {
+  }), count !== total && /* @__PURE__ */ import_react29.default.createElement("div", {
     className: "absolute top-0 bottom-0 flex items-center mx-0.5 text-black text-xs"
   }, count));
 };
@@ -1930,19 +1925,19 @@ var getIcon = (status) => {
 var SyncStatus = () => {
   const client = (0, import_react_client10.useClient)();
   const state = useSyncState();
-  const [saved, setSaved] = (0, import_react27.useState)(true);
-  (0, import_react27.useEffect)(() => {
+  const [saved, setSaved] = (0, import_react28.useState)(true);
+  (0, import_react28.useEffect)(() => {
     return createClientSaveTracker(client, (state2) => {
       setSaved(state2 === "saved");
     });
   }, []);
-  return /* @__PURE__ */ import_react27.default.createElement(SyncStatusIndicator, {
+  return /* @__PURE__ */ import_react28.default.createElement(SyncStatusIndicator, {
     state,
     saved
   });
 };
 var SyncStatusIndicator = ({ state, saved }) => {
-  const { t } = (0, import_react_ui19.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const { t } = (0, import_react_ui19.useTranslation)(import_chunk_46S3JOES.SPACE_PLUGIN);
   const summary = getSyncSummary(state);
   const offline = Object.values(state).length === 0;
   const needsToUpload = summary.differentDocuments > 0 || summary.missingOnRemote > 0;
@@ -1953,8 +1948,8 @@ var SyncStatusIndicator = ({ state, saved }) => {
     needsToUpload,
     needsToDownload
   });
-  const [classNames, setClassNames] = (0, import_react27.useState)();
-  (0, import_react27.useEffect)(() => {
+  const [classNames, setClassNames] = (0, import_react28.useState)();
+  (0, import_react28.useEffect)(() => {
     setClassNames(void 0);
     if (offline || !needsToUpload && !needsToDownload) {
       return;
@@ -1969,23 +1964,23 @@ var SyncStatusIndicator = ({ state, saved }) => {
     needsToDownload
   ]);
   const title = t(`${status} label`);
-  const icon = /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Icon, {
+  const icon = /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Icon, {
     icon: getIcon(status),
     size: 4,
     classNames
   });
   if (offline) {
-    return /* @__PURE__ */ import_react27.default.createElement(import_plugin_status_bar.StatusBar.Item, {
+    return /* @__PURE__ */ import_react28.default.createElement(import_plugin_status_bar.StatusBar.Item, {
       title
     }, icon);
   } else {
-    return /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Popover.Root, null, /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Popover.Trigger, {
+    return /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Popover.Root, null, /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Popover.Trigger, {
       asChild: true
-    }, /* @__PURE__ */ import_react27.default.createElement(import_plugin_status_bar.StatusBar.Button, {
+    }, /* @__PURE__ */ import_react28.default.createElement(import_plugin_status_bar.StatusBar.Button, {
       title
-    }, icon)), /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Popover.Portal, null, /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Popover.Content, {
+    }, icon)), /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Popover.Portal, null, /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Popover.Content, {
       sideOffset: 16
-    }, /* @__PURE__ */ import_react27.default.createElement(SyncStatusDetail, {
+    }, /* @__PURE__ */ import_react28.default.createElement(SyncStatusDetail, {
       state,
       summary,
       debug: false
@@ -1993,46 +1988,46 @@ var SyncStatusIndicator = ({ state, saved }) => {
   }
 };
 var SyncStatusDetail = ({ classNames, state, summary, debug }) => {
-  const [showAll, setShowAll] = (0, import_react27.useState)(false);
-  const { t } = (0, import_react_ui19.useTranslation)(import_chunk_QNVEU2UD.SPACE_PLUGIN);
+  const [showAll, setShowAll] = (0, import_react28.useState)(false);
+  const { t } = (0, import_react_ui19.useTranslation)(import_chunk_46S3JOES.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 = (0, import_react27.useCallback)((state2) => setShowAll(state2), [
+  const handleCheckedChange = (0, import_react28.useCallback)((state2) => setShowAll(state2), [
     setShowAll
   ]);
-  return /* @__PURE__ */ import_react27.default.createElement("div", {
-    className: (0, import_react_ui_theme4.mx)("flex flex-col gap-3 p-2 text-xs min-w-96", classNames)
-  }, /* @__PURE__ */ import_react27.default.createElement("div", {
+  return /* @__PURE__ */ import_react28.default.createElement("div", {
+    className: (0, import_react_ui_theme5.mx)("flex flex-col gap-3 p-2 text-xs min-w-96", classNames)
+  }, /* @__PURE__ */ import_react28.default.createElement("div", {
     role: "none",
     className: "flex items-center"
-  }, /* @__PURE__ */ import_react27.default.createElement("h1", {
+  }, /* @__PURE__ */ import_react28.default.createElement("h1", {
     className: "flex-1"
-  }, t("sync status title")), /* @__PURE__ */ import_react27.default.createElement("div", {
+  }, t("sync status title")), /* @__PURE__ */ import_react28.default.createElement("div", {
     className: "flex items-center gap-2"
-  }, /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Input.Root, null, /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Input.Label, {
+  }, /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Input.Root, null, /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Input.Label, {
     classNames: "text-xs"
-  }, t("show all label")), /* @__PURE__ */ import_react27.default.createElement(import_react_ui19.Input.Checkbox, {
+  }, t("show all label")), /* @__PURE__ */ import_react28.default.createElement(import_react_ui19.Input.Checkbox, {
     checked: showAll,
     onCheckedChange: handleCheckedChange
-  })))), /* @__PURE__ */ import_react27.default.createElement("div", {
+  })))), /* @__PURE__ */ import_react28.default.createElement("div", {
     className: "flex flex-col gap-2"
-  }, entries.length === 0 && /* @__PURE__ */ import_react27.default.createElement("div", {
+  }, entries.length === 0 && /* @__PURE__ */ import_react28.default.createElement("div", {
     role: "none",
     className: "flex justify-center"
-  }, t("no sync status label")), entries.map(([spaceId, state2]) => /* @__PURE__ */ import_react27.default.createElement(SpaceRowContainer, {
+  }, t("no sync status label")), entries.map(([spaceId, state2]) => /* @__PURE__ */ import_react28.default.createElement(SpaceRowContainer, {
     key: spaceId,
     spaceId,
     state: state2
-  }))), debug && /* @__PURE__ */ import_react27.default.createElement(import_react_ui_syntax_highlighter.SyntaxHighlighter, {
+  }))), debug && /* @__PURE__ */ import_react28.default.createElement(import_react_ui_syntax_highlighter.SyntaxHighlighter, {
     language: "json"
   }, JSON.stringify(summary, null, 2)));
 };
 var translations_default = [
   {
     "en-US": {
-      [import_chunk_6SNOZF7Y.CollectionType.typename]: {
+      [import_chunk_YF2AQ7KP.CollectionType.typename]: {
         "typename label": "Collection"
       },
-      [import_chunk_QNVEU2UD.SPACE_PLUGIN]: {
+      [import_chunk_46S3JOES.SPACE_PLUGIN]: {
         "plugin name": "Spaces",
         "first run message": "Nothing selected.",
         "create space label": "Create space",
@@ -2126,7 +2121,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",
@@ -2134,9 +2129,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"
       }
     }
   }
@@ -2148,8 +2144,8 @@ var SPACE_MAX_OBJECTS = 500;
 var DIRECTORY_TYPE = "text/directory";
 var parseSpacePlugin = (plugin) => Array.isArray(plugin?.provides.space?.enabled) ? plugin : void 0;
 var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "spaceInvitationCode", firstRun, onFirstRun } = {}) => {
-  const settings = new import_local_storage.LocalStorageStore(import_chunk_QNVEU2UD.SPACE_PLUGIN, {});
-  const state = new import_local_storage.LocalStorageStore(import_chunk_QNVEU2UD.SPACE_PLUGIN, {
+  const settings = new import_local_storage.LocalStorageStore(import_chunk_46S3JOES.SPACE_PLUGIN, {});
+  const state = new import_local_storage.LocalStorageStore(import_chunk_46S3JOES.SPACE_PLUGIN, {
     awaiting: void 0,
     spaceNames: {},
     viewersByObject: {},
@@ -2169,7 +2165,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);
@@ -2210,13 +2205,9 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
         const timeout = setTimeout(async () => {
           const node2 = graph.findNode(soloPart.id);
           if (!node2) {
-            await dispatch({
-              plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-              action: import_chunk_QNVEU2UD.SpaceAction.WAIT_FOR_OBJECT,
-              data: {
-                id: soloPart.id
-              }
-            });
+            await dispatch((0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.WaitForObject, {
+              id: soloPart.id
+            }));
           }
         }, WAIT_FOR_OBJECT_TIMEOUT2);
         return () => clearTimeout(timeout);
@@ -2285,7 +2276,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)
               });
@@ -2338,15 +2329,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
     } catch (err) {
       import_log.log.catch(err, void 0, {
         F: __dxlog_file6,
-        L: 389,
+        L: 393,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   };
   return {
-    meta: import_chunk_QNVEU2UD.meta_default,
-    ready: async (plugins) => {
+    meta: import_chunk_46S3JOES.meta_default,
+    ready: async ({ plugins }) => {
       settings.prop({
         key: "showHidden",
         type: import_local_storage.LocalStorageStore.bool({
@@ -2365,34 +2356,33 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       }
       graphPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseGraphPlugin);
       layoutPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseLayoutPlugin);
-      metadataPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin);
       navigationPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin);
       attentionPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_attention.parseAttentionPlugin);
-      clientPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin);
+      clientPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_types.parseClientPlugin);
       intentPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin);
       if (!clientPlugin || !intentPlugin) {
         return;
       }
       const client = clientPlugin.provides.client;
-      const dispatch = intentPlugin.provides.intent.dispatch;
-      schemas.push(...(0, import_app_framework.filterPlugins)(plugins, import_chunk_6SNOZF7Y.parseSchemaPlugin).map((plugin) => plugin.provides.echo.schema).filter(import_util.nonNullable).reduce((acc, schema) => {
+      const dispatch = intentPlugin.provides.intent.dispatchPromise;
+      schemas.push(...(0, import_app_framework.filterPlugins)(plugins, import_chunk_YF2AQ7KP.parseSchemaPlugin).map((plugin) => plugin.provides.echo.schema).filter(import_util.nonNullable).reduce((acc, schema) => {
         return [
           ...acc,
           ...schema
         ];
       }));
       client.addTypes(schemas);
-      (0, import_app_framework.filterPlugins)(plugins, import_chunk_6SNOZF7Y.parseSchemaPlugin).forEach((plugin) => {
+      (0, import_app_framework.filterPlugins)(plugins, import_chunk_YF2AQ7KP.parseSchemaPlugin).forEach((plugin) => {
         if (plugin.provides.echo.system) {
           client.addTypes(plugin.provides.echo.system);
         }
       });
       const handleFirstRun = async () => {
         const defaultSpace = client.spaces.default;
-        defaultSpace.properties[import_chunk_6SNOZF7Y.CollectionType.typename] = (0, import_live_object.create)(import_chunk_6SNOZF7Y.CollectionType, {
+        defaultSpace.properties[import_chunk_YF2AQ7KP.CollectionType.typename] = (0, import_live_object.makeRef)((0, import_live_object.create)(import_chunk_YF2AQ7KP.CollectionType, {
           objects: [],
           views: {}
-        });
+        }));
         if (import_migrations.Migrations.versionProperty) {
           defaultSpace.properties[import_migrations.Migrations.versionProperty] = import_migrations.Migrations.targetVersion;
         }
@@ -2435,7 +2425,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             label: [
               "open settings panel label",
               {
-                ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                ns: import_chunk_46S3JOES.SPACE_PLUGIN
               }
             ],
             icon: "ph--gear--regular"
@@ -2447,148 +2437,226 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
       }) : null,
       metadata: {
         records: {
-          [import_chunk_6SNOZF7Y.CollectionType.typename]: {
-            createObject: import_chunk_QNVEU2UD.CollectionAction.CREATE,
+          [import_chunk_YF2AQ7KP.CollectionType.typename]: {
+            createObject: (props) => (0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.CollectionAction.Create, props),
             placeholder: [
               "unnamed collection label",
               {
-                ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                ns: import_chunk_46S3JOES.SPACE_PLUGIN
               }
             ],
             icon: "ph--cards-three--regular",
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (collection) => (0, import_echo.loadObjectReferences)(collection, (collection2) => [
-              ...collection2.objects,
-              ...Object.values(collection2.views)
+            loadReferences: async (collection) => await import_live_object.RefArray.loadAll([
+              ...collection.objects,
+              ...Object.values(collection.views)
             ])
           }
         }
       },
       echo: {
         schema: [
-          import_chunk_6SNOZF7Y.CollectionType
+          import_chunk_YF2AQ7KP.CollectionType
         ]
       },
       surface: {
-        component: ({ data, role, ...rest }) => {
-          switch (role) {
-            case "article":
-              return (0, import_echo.isSpace)(data.object) && data.object.state.get() === import_echo.SpaceState.SPACE_READY ? /* @__PURE__ */ import_react.default.createElement(import_app_framework.Surface, {
+        definitions: ({ plugins }) => {
+          const resolve = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
+          const attention = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_attention.parseAttentionPlugin)?.provides.attention;
+          (0, import_invariant.invariant)(resolve, "Metadata plugin not found.", {
+            F: __dxlog_file6,
+            L: 503,
+            S: void 0,
+            A: [
+              "resolve",
+              "'Metadata plugin not found.'"
+            ]
+          });
+          (0, import_invariant.invariant)(attention, "Attention plugin not found.", {
+            F: __dxlog_file6,
+            L: 504,
+            S: void 0,
+            A: [
+              "attention",
+              "'Attention plugin not found.'"
+            ]
+          });
+          return [
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/article`,
+              role: "article",
+              filter: (data) => (
+                // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
+                (0, import_echo.isSpace)(data.subject) && data.subject.state.get() === import_echo.SpaceState.SPACE_READY
+              ),
+              component: ({ data, role, ...rest }) => /* @__PURE__ */ import_react.default.createElement(import_app_framework.Surface, {
                 data: {
-                  object: data.object.properties[import_chunk_6SNOZF7Y.CollectionType.typename],
-                  id: data.object.id
+                  id: data.subject.id,
+                  subject: data.subject.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target
                 },
                 role,
                 ...rest
-              }) : data.object instanceof import_chunk_6SNOZF7Y.CollectionType ? {
-                node: /* @__PURE__ */ import_react.default.createElement(CollectionMain, {
-                  collection: data.object
-                }),
-                disposition: "fallback"
-              } : null;
-            // TODO(burdon): Add role name syntax to minimal plugin docs.
-            case "complementary--settings":
-              return (0, import_echo.isSpace)(data.subject) ? /* @__PURE__ */ import_react.default.createElement(SpaceSettingsPanel, {
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/collection-fallback`,
+              role: "article",
+              disposition: "fallback",
+              filter: (data) => data.subject instanceof import_chunk_YF2AQ7KP.CollectionType,
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(CollectionMain, {
+                collection: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/settings-panel`,
+              // TODO(burdon): Add role name syntax to minimal plugin docs.
+              role: "complementary--settings",
+              filter: (data) => (0, import_echo.isSpace)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(SpaceSettingsPanel, {
                 space: data.subject
-              }) : (0, import_echo.isEchoObject)(data.subject) ? {
-                node: /* @__PURE__ */ import_react.default.createElement(DefaultObjectSettings, {
-                  object: data.subject
-                }),
-                disposition: "fallback"
-              } : null;
-            case "dialog":
-              if (data.component === "dxos.org/plugin/space/SpaceSettingsDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(SpaceSettingsDialog, {
-                  ...data.subject,
-                  createInvitationUrl: createSpaceInvitationUrl
-                });
-              } else if (data.component === "dxos.org/plugin/space/JoinDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(JoinDialog, data.subject);
-              } else if (data.component === "dxos.org/plugin/space/CreateSpaceDialog") {
-                return /* @__PURE__ */ import_react.default.createElement(CreateSpaceDialog, null);
-              } else if (data.component === "dxos.org/plugin/space/CreateObjectDialog") {
-                return /* @__PURE__ */ import_react.default.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" && (0, import_echo.isSpace)(data.subject)) {
-                return /* @__PURE__ */ import_react.default.createElement(PopoverRenameSpace, {
-                  space: data.subject
-                });
-              }
-              if (data.component === "dxos.org/plugin/space/RenameObjectPopover" && (0, import_live_object.isReactiveObject)(data.subject)) {
-                return /* @__PURE__ */ import_react.default.createElement(PopoverRenameObject, {
-                  object: data.subject
-                });
-              }
-              return null;
-            }
-            case "navtree-item-end": {
-              return (0, import_live_object.isReactiveObject)(data.object) ? /* @__PURE__ */ import_react.default.createElement(SmallPresenceLive, {
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/object-settings-panel-fallback`,
+              role: "complementary--settings",
+              disposition: "fallback",
+              filter: (data) => (0, import_echo.isEchoObject)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(DefaultObjectSettings, {
+                object: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: SPACE_SETTINGS_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === SPACE_SETTINGS_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(SpaceSettingsDialog, {
+                ...data.subject,
+                createInvitationUrl: createSpaceInvitationUrl
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: JOIN_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === JOIN_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(JoinDialog, data.subject)
+            }),
+            (0, import_app_framework.createSurface)({
+              id: CREATE_SPACE_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === CREATE_SPACE_DIALOG,
+              component: () => /* @__PURE__ */ import_react.default.createElement(CreateSpaceDialog, null)
+            }),
+            (0, import_app_framework.createSurface)({
+              id: CREATE_OBJECT_DIALOG,
+              role: "dialog",
+              filter: (data) => data.component === CREATE_OBJECT_DIALOG,
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(CreateObjectDialog, {
+                schemas,
+                resolve,
+                ...data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: POPOVER_RENAME_SPACE,
+              role: "popover",
+              filter: (data) => data.component === POPOVER_RENAME_SPACE && (0, import_echo.isSpace)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(PopoverRenameSpace, {
+                space: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: POPOVER_RENAME_OBJECT,
+              role: "popover",
+              filter: (data) => data.component === POPOVER_RENAME_OBJECT && (0, import_live_object.isReactiveObject)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(PopoverRenameObject, {
+                object: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/navtree-presence`,
+              role: "navtree-item-end",
+              filter: (data) => typeof data.id === "string" && (0, import_echo.isEchoObject)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(SmallPresenceLive, {
                 id: data.id,
-                viewers: state.values.viewersByObject[(0, import_echo.fullyQualifiedId)(data.object)]
-              }) : (0, import_echo.isSpace)(data.object) ? /* @__PURE__ */ import_react.default.createElement(InlineSyncStatus, {
-                space: data.object
-              }) : (
-                // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
-                /* @__PURE__ */ import_react.default.createElement(SmallPresence, {
-                  id: data.id,
-                  count: 0
-                })
-              );
-            }
-            case "navbar-end": {
-              if (!(0, import_echo.isEchoObject)(data.object) && !(0, import_echo.isSpace)(data.object)) {
-                return null;
-              }
-              const space = (0, import_echo.isSpace)(data.object) ? data.object : (0, import_echo.getSpace)(data.object);
-              const object = (0, import_echo.isSpace)(data.object) ? data.object.state.get() === import_echo.SpaceState.SPACE_READY ? space?.properties[import_chunk_6SNOZF7Y.CollectionType.typename] : void 0 : data.object;
-              return space && object ? {
-                node: /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(SpacePresence, {
+                open: data.open,
+                viewers: state.values.viewersByObject[data.id]
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/navtree-presence-fallback`,
+              role: "navtree-item-end",
+              disposition: "fallback",
+              filter: (data) => typeof data.id === "string",
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(SmallPresenceLive, {
+                id: data.id,
+                open: data.open
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/navtree-sync-status`,
+              role: "navtree-item-end",
+              filter: (data) => (0, import_echo.isSpace)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(InlineSyncStatus, {
+                space: data.subject,
+                open: data.open
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/navbar-presence`,
+              role: "navbar-end",
+              disposition: "hoist",
+              filter: (data) => (0, import_echo.isSpace)(data.subject) || (0, import_echo.isEchoObject)(data.subject),
+              component: ({ data }) => {
+                const space = (0, import_echo.isSpace)(data.subject) ? data.subject : (0, import_echo.getSpace)(data.subject);
+                const object = (0, import_echo.isSpace)(data.subject) ? data.subject.state.get() === import_echo.SpaceState.SPACE_READY ? space?.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target : void 0 : data.subject;
+                return space && object ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(SpacePresence, {
                   object
                 }), space.properties[COMPOSER_SPACE_LOCK] ? null : /* @__PURE__ */ import_react.default.createElement(ShareSpaceButton, {
                   space
-                })),
-                disposition: "hoist"
-              } : null;
-            }
-            case "section":
-              return data.object instanceof import_chunk_6SNOZF7Y.CollectionType ? /* @__PURE__ */ import_react.default.createElement(CollectionSection, {
-                collection: data.object
-              }) : null;
-            case "settings":
-              return data.plugin === import_chunk_QNVEU2UD.meta_default.id ? /* @__PURE__ */ import_react.default.createElement(SpacePluginSettings, {
-                settings: settings.values
-              }) : null;
-            case "menu-footer":
-              if ((0, import_echo.isEchoObject)(data.object)) {
-                return /* @__PURE__ */ import_react.default.createElement(MenuFooter, {
-                  object: data.object
-                });
-              } else {
-                return null;
+                })) : null;
               }
-            case "status": {
-              return /* @__PURE__ */ import_react.default.createElement(SyncStatus, null);
-            }
-            default:
-              return null;
-          }
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/collection-section`,
+              role: "section",
+              filter: (data) => data.subject instanceof import_chunk_YF2AQ7KP.CollectionType,
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(CollectionSection, {
+                collection: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/settings`,
+              role: "settings",
+              filter: (data) => data.subject === import_chunk_46S3JOES.SPACE_PLUGIN,
+              component: () => /* @__PURE__ */ import_react.default.createElement(SpacePluginSettings, {
+                settings: settings.values
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/menu-footer`,
+              role: "menu-footer",
+              filter: (data) => (0, import_echo.isEchoObject)(data.subject),
+              component: ({ data }) => /* @__PURE__ */ import_react.default.createElement(MenuFooter, {
+                object: data.subject
+              })
+            }),
+            (0, import_app_framework.createSurface)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/status`,
+              role: "status",
+              component: () => /* @__PURE__ */ import_react.default.createElement(SyncStatus, null)
+            })
+          ];
         }
       },
       graph: {
         builder: (plugins) => {
-          const clientPlugin2 = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin);
-          const metadataPlugin2 = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin);
+          const clientPlugin2 = (0, import_app_framework.resolvePlugin)(plugins, import_types.parseClientPlugin);
+          const metadataPlugin = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin);
           const graphPlugin2 = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.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 [];
@@ -2604,7 +2672,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               label: [
                 "spaces label",
                 {
-                  ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                  ns: import_chunk_46S3JOES.SPACE_PLUGIN
                 }
               ],
               testId: "spacePlugin.spaces",
@@ -2621,7 +2689,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 } else {
                   import_log.log.warn("spaces order object not found", void 0, {
                     F: __dxlog_file6,
-                    L: 649,
+                    L: 694,
                     S: void 0,
                     C: (f, a) => f(...a)
                   });
@@ -2630,62 +2698,61 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }
           };
           return [
-            // Create spaces group node.
+            // Primary actions.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/root`,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/primary-actions`,
               filter: (node) => node.id === "root",
-              connector: () => [
-                spacesNode
-              ],
-              resolver: ({ id }) => id === SPACES ? spacesNode : void 0
-            }),
-            // Create space nodes.
-            (0, import_plugin_graph.createExtension)({
-              id: SPACES,
-              filter: (node) => node.id === SPACES,
               actions: () => [
                 {
-                  id: import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_SPACE,
+                  id: import_chunk_YF2AQ7KP.SpaceAction.OpenCreateSpace._tag,
                   data: async () => {
-                    await dispatch({
-                      plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-                      action: import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_SPACE
-                    });
+                    await dispatch((0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateSpace));
                   },
                   properties: {
                     label: [
                       "create space label",
                       {
-                        ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
                       }
                     ],
                     icon: "ph--plus--regular",
                     testId: "spacePlugin.createSpace",
-                    disposition: "item",
-                    className: "border-t border-separator"
+                    disposition: "item"
                   }
                 },
                 {
-                  id: import_chunk_QNVEU2UD.SpaceAction.JOIN,
+                  id: import_chunk_YF2AQ7KP.SpaceAction.Join._tag,
                   data: async () => {
-                    await dispatch({
-                      plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-                      action: import_chunk_QNVEU2UD.SpaceAction.JOIN
-                    });
+                    await dispatch((0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Join));
                   },
                   properties: {
                     label: [
                       "join space label",
                       {
-                        ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
                       }
                     ],
                     icon: "ph--sign-in--regular",
                     testId: "spacePlugin.joinSpace",
-                    disposition: "item"
+                    disposition: "item",
+                    className: "border-b border-separator"
                   }
                 }
+              ]
+            }),
+            // Create spaces group node.
+            (0, import_plugin_graph.createExtension)({
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/root`,
+              filter: (node) => node.id === "root",
+              connector: () => [
+                spacesNode
               ],
+              resolver: ({ id }) => id === SPACES ? spacesNode : void 0
+            }),
+            // Create space nodes.
+            (0, import_plugin_graph.createExtension)({
+              id: SPACES,
+              filter: (node) => node.id === SPACES,
               connector: () => {
                 const spaces = (0, import_plugin_graph.toSignal)((onChange) => client.spaces.subscribe(() => onChange()).unsubscribe, () => client.spaces.get());
                 const isReady = (0, import_plugin_graph.toSignal)((onChange) => client.spaces.isReady.subscribe(() => onChange()).unsubscribe, () => client.spaces.isReady.get());
@@ -2742,7 +2809,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }),
             // Create space actions.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/actions`,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/actions`,
               filter: (node) => (0, import_echo.isSpace)(node.data),
               actions: ({ node }) => {
                 const space = node.data;
@@ -2756,7 +2823,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }),
             // Create nodes for objects in the root collection of a space.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/root-collection`,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/root-collection`,
               filter: (node) => (0, import_echo.isSpace)(node.data),
               connector: ({ node }) => {
                 const space = node.data;
@@ -2764,11 +2831,11 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 if (spaceState !== import_echo.SpaceState.SPACE_READY) {
                   return;
                 }
-                const collection = space.properties[import_chunk_6SNOZF7Y.CollectionType.typename];
+                const collection = space.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target;
                 if (!collection) {
                   return;
                 }
-                return collection.objects.filter(import_util.nonNullable).map((object) => createObjectNode({
+                return collection.objects.map((object) => object.target).filter(import_util.nonNullable).map((object) => createObjectNode({
                   object,
                   space,
                   resolve,
@@ -2778,15 +2845,15 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }),
             // Create nodes for objects in a collection or by its fully qualified id.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/objects`,
-              filter: (node) => node.data instanceof import_chunk_6SNOZF7Y.CollectionType,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/objects`,
+              filter: (node) => node.data instanceof import_chunk_YF2AQ7KP.CollectionType,
               connector: ({ node }) => {
                 const collection = node.data;
                 const space = (0, import_echo.getSpace)(collection);
                 if (!space) {
                   return;
                 }
-                return collection.objects.filter(import_util.nonNullable).map((object) => createObjectNode({
+                return collection.objects.map((object) => object.target).filter(import_util.nonNullable).map((object) => createObjectNode({
                   object,
                   space,
                   resolve,
@@ -2814,11 +2881,13 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   if (!store.value) {
                     void space.db.query({
                       id: objectId
+                    }, {
+                      deleted: import_echo.QueryOptions.ShowDeletedOption.SHOW_DELETED
                     }).first().then((o) => store.value = o).catch((err) => import_log.log.catch(err, {
                       objectId
                     }, {
                       F: __dxlog_file6,
-                      L: 872,
+                      L: 919,
                       S: void 0,
                       C: (f, a) => f(...a)
                     }));
@@ -2842,7 +2911,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }),
             // Create collection actions and action groups.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/object-actions`,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/object-actions`,
               filter: (node) => (0, import_echo.isEchoObject)(node.data),
               actions: ({ node }) => constructObjectActions({
                 node,
@@ -2851,7 +2920,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
             }),
             // Create nodes for object settings.
             (0, import_plugin_graph.createExtension)({
-              id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/settings-for-subject`,
+              id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/settings-for-subject`,
               resolver: ({ id }) => {
                 if (!id.endsWith("~settings")) {
                   return;
@@ -2866,12 +2935,12 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   const label2 = space ? space.properties.name || [
                     "unnamed space label",
                     {
-                      ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                      ns: import_chunk_46S3JOES.SPACE_PLUGIN
                     }
                   ] : [
                     "unnamed object settings label",
                     {
-                      ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                      ns: import_chunk_46S3JOES.SPACE_PLUGIN
                     }
                   ];
                   return {
@@ -2897,7 +2966,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                 const label = meta.label?.(object) || object.name || meta.placeholder || [
                   "unnamed object settings label",
                   {
-                    ns: import_chunk_QNVEU2UD.SPACE_PLUGIN
+                    ns: import_chunk_46S3JOES.SPACE_PLUGIN
                   }
                 ];
                 return {
@@ -2915,7 +2984,7 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
           ];
         },
         serializer: (plugins) => {
-          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatch;
+          const dispatch = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseIntentPlugin)?.provides.intent.dispatchPromise;
           if (!dispatch) {
             return [];
           }
@@ -2924,8 +2993,8 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               inputType: SPACES,
               outputType: DIRECTORY_TYPE,
               serialize: (node) => ({
-                name: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["spaces label"],
-                data: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["spaces label"],
+                name: translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["spaces label"],
+                data: translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["spaces label"],
                 type: DIRECTORY_TYPE
               }),
               deserialize: () => {
@@ -2935,98 +3004,101 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
               inputType: SPACE_TYPE,
               outputType: DIRECTORY_TYPE,
               serialize: (node) => ({
-                name: node.data.properties.name ?? translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["unnamed space label"],
-                data: node.data.properties.name ?? translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["unnamed space label"],
+                name: node.data.properties.name ?? translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["unnamed space label"],
+                data: node.data.properties.name ?? translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["unnamed space label"],
                 type: DIRECTORY_TYPE
               }),
               deserialize: async (data) => {
-                const result = await dispatch({
-                  plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-                  action: import_chunk_QNVEU2UD.SpaceAction.CREATE,
-                  data: {
-                    name: data.name
-                  }
-                });
-                return result?.data.space;
+                const result = await dispatch((0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.Create, {
+                  name: data.name,
+                  edgeReplication: true
+                }));
+                return result.data?.space;
               }
             },
             {
-              inputType: import_chunk_6SNOZF7Y.CollectionType.typename,
+              inputType: import_chunk_YF2AQ7KP.CollectionType.typename,
               outputType: DIRECTORY_TYPE,
               serialize: (node) => ({
-                name: node.data.name ?? translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["unnamed collection label"],
-                data: node.data.name ?? translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["unnamed collection label"],
+                name: node.data.name ?? translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["unnamed collection label"],
+                data: node.data.name ?? translations_default[0]["en-US"][import_chunk_46S3JOES.SPACE_PLUGIN]["unnamed collection label"],
                 type: DIRECTORY_TYPE
               }),
               deserialize: async (data, ancestors) => {
                 const space = ancestors.find(import_echo.isSpace);
-                const collection = ancestors.findLast((ancestor) => ancestor instanceof import_chunk_6SNOZF7Y.CollectionType) ?? space?.properties[import_chunk_6SNOZF7Y.CollectionType.typename];
+                const collection = ancestors.findLast((ancestor) => ancestor instanceof import_chunk_YF2AQ7KP.CollectionType) ?? space?.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target;
                 if (!space || !collection) {
                   return;
                 }
-                const result = await dispatch({
-                  plugin: import_chunk_QNVEU2UD.SPACE_PLUGIN,
-                  action: import_chunk_QNVEU2UD.SpaceAction.ADD_OBJECT,
-                  data: {
-                    target: collection,
-                    object: (0, import_live_object.create)(import_chunk_6SNOZF7Y.CollectionType, {
-                      name: data.name,
-                      objects: [],
-                      views: {}
-                    })
-                  }
-                });
-                return result?.data.object;
+                const result = await dispatch((0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.AddObject, {
+                  target: collection,
+                  object: (0, import_live_object.create)(import_chunk_YF2AQ7KP.CollectionType, {
+                    name: data.name,
+                    objects: [],
+                    views: {}
+                  })
+                }));
+                return result.data?.object;
               }
             }
           ];
         }
       },
       intent: {
-        resolver: async (intent, plugins) => {
-          const clientPlugin2 = (0, import_app_framework.resolvePlugin)(plugins, import_plugin_client.parseClientPlugin);
-          const client = clientPlugin2?.provides.client;
-          switch (intent.action) {
-            case import_chunk_QNVEU2UD.SpaceAction.WAIT_FOR_OBJECT: {
-              state.values.awaiting = intent.data?.id;
-              return {
-                data: true
-              };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_SPACE: {
-              return {
-                data: true,
-                intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/CreateSpaceDialog",
-                        dialogBlockAlign: "start",
-                        subject: intent.data
-                      }
-                    }
-                  ]
-                ]
-              };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.CREATE: {
-              if (!client || !import_echo_schema.S.is(import_chunk_6SNOZF7Y.SpaceForm)(intent.data)) {
-                return;
-              }
+        resolvers: ({ plugins, dispatchPromise: dispatch }) => {
+          const activeParts = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseNavigationPlugin)?.provides.location.active;
+          const client = (0, import_app_framework.resolvePlugin)(plugins, import_types.parseClientPlugin)?.provides.client;
+          const resolve = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
+          (0, import_invariant.invariant)(activeParts, "Active parts not available.", {
+            F: __dxlog_file6,
+            L: 1078,
+            S: void 0,
+            A: [
+              "activeParts",
+              "'Active parts not available.'"
+            ]
+          });
+          (0, import_invariant.invariant)(client, "Client not available.", {
+            F: __dxlog_file6,
+            L: 1079,
+            S: void 0,
+            A: [
+              "client",
+              "'Client not available.'"
+            ]
+          });
+          (0, import_invariant.invariant)(resolve, "Metadata resolver not available.", {
+            F: __dxlog_file6,
+            L: 1080,
+            S: void 0,
+            A: [
+              "resolve",
+              "'Metadata resolver not available.'"
+            ]
+          });
+          return [
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateSpace, () => ({
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  component: CREATE_SPACE_DIALOG,
+                  dialogBlockAlign: "start"
+                })
+              ]
+            })),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.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(import_metadata.EdgeReplicationSetting.ENABLED);
               }
               await space.waitUntilReady();
-              const collection = (0, import_live_object.create)(import_chunk_6SNOZF7Y.CollectionType, {
+              const collection = (0, import_live_object.create)(import_chunk_YF2AQ7KP.CollectionType, {
                 objects: [],
                 views: {}
               });
-              space.properties[import_chunk_6SNOZF7Y.CollectionType.typename] = collection;
+              space.properties[import_chunk_YF2AQ7KP.CollectionType.typename] = (0, import_live_object.makeRef)(collection);
               if (import_migrations.Migrations.versionProperty) {
                 space.properties[import_migrations.Migrations.versionProperty] = import_migrations.Migrations.targetVersion;
               }
@@ -3041,304 +3113,224 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   }
                 },
                 intents: [
-                  [
-                    {
-                      action: import_meta.ObservabilityAction.SEND_EVENT,
-                      data: {
-                        name: "space.create",
-                        properties: {
-                          spaceId: space.id
-                        }
-                      }
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.create",
+                    properties: {
+                      spaceId: space.id
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.JOIN: {
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Join, ({ invitationCode }) => ({
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "dialog",
+                  component: JOIN_DIALOG,
+                  dialogBlockAlign: "start",
+                  subject: {
+                    initialInvitationCode: invitationCode
+                  }
+                })
+              ]
+            })),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Share, ({ space }) => {
+              const active = navigationPlugin?.provides.location.active;
+              const mode = layoutPlugin?.provides.layout.layoutMode;
+              const current = active ? (0, import_app_framework.firstIdInPart)(active, mode === "solo" ? "solo" : "main") : void 0;
+              const target = current?.startsWith(space.id) ? current : void 0;
               return {
-                data: true,
                 intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/JoinDialog",
-                        dialogBlockAlign: "start",
-                        subject: {
-                          initialInvitationCode: intent.data?.invitationCode,
-                          onDone: intent.data?.onDone
-                        }
-                      }
+                  (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                    element: "dialog",
+                    component: SPACE_SETTINGS_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      space,
+                      target,
+                      initialTab: "members",
+                      createInvitationUrl: createSpaceInvitationUrl
                     }
-                  ]
+                  }),
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.share",
+                    properties: {
+                      space: space.id
+                    }
+                  })
                 ]
               };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.SHARE: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space) && !space.properties[COMPOSER_SPACE_LOCK]) {
-                const active = navigationPlugin?.provides.location.active;
-                const mode = layoutPlugin?.provides.layout.layoutMode;
-                const current = active ? (0, import_app_framework.firstIdInPart)(active, mode === "solo" ? "solo" : "main") : void 0;
-                const target = current?.startsWith(space.id) ? current : void 0;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "dialog",
-                          component: "dxos.org/plugin/space/SpaceSettingsDialog",
-                          dialogBlockAlign: "start",
-                          subject: {
-                            space,
-                            target,
-                            initialTab: "members",
-                            createInvitationUrl: createSpaceInvitationUrl
-                          }
-                        }
-                      }
-                    ],
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "space.share",
-                          properties: {
-                            space: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.LOCK: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                space.properties[COMPOSER_SPACE_LOCK] = true;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "space.lock",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.UNLOCK: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                space.properties[COMPOSER_SPACE_LOCK] = false;
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "space.unlock",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.RENAME: {
-              const { caller, space } = intent.data ?? {};
-              if (typeof caller === "string" && (0, import_echo.isSpace)(space)) {
-                return {
-                  intents: [
-                    [
-                      {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "popover",
-                          anchorId: `dxos.org/ui/${caller}/${space.id}`,
-                          component: "dxos.org/plugin/space/RenameSpacePopover",
-                          subject: space
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.OPEN_SETTINGS: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                return {
-                  data: true,
-                  intents: [
-                    [
-                      {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "dialog",
-                          component: "dxos.org/plugin/space/SpaceSettingsDialog",
-                          dialogBlockAlign: "start",
-                          subject: {
-                            space,
-                            initialTab: "settings",
-                            createInvitationUrl: createSpaceInvitationUrl
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.OPEN: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                await space.open();
-                return {
-                  data: true
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.CLOSE: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                await space.close();
-                return {
-                  data: true
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.MIGRATE: {
-              const space = intent.data?.space;
-              if ((0, import_echo.isSpace)(space)) {
-                if (space.state.get() === import_echo.SpaceState.SPACE_REQUIRES_MIGRATION) {
-                  state.values.sdkMigrationRunning[space.id] = true;
-                  await space.internal.migrate();
-                  state.values.sdkMigrationRunning[space.id] = false;
-                }
-                const result = await import_migrations.Migrations.migrate(space, intent.data?.version);
-                return {
-                  data: result,
-                  intents: [
-                    [
-                      {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "space.migrate",
-                          properties: {
-                            spaceId: space.id,
-                            version: intent.data?.version
-                          }
-                        }
-                      }
-                    ]
-                  ]
-                };
-              }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.OPEN_CREATE_OBJECT: {
+            }, {
+              filter: (data) => !data.space.properties[COMPOSER_SPACE_LOCK]
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Lock, ({ space }) => {
+              space.properties[COMPOSER_SPACE_LOCK] = true;
               return {
-                data: true,
                 intents: [
-                  [
-                    {
-                      action: import_app_framework.LayoutAction.SET_LAYOUT,
-                      data: {
-                        element: "dialog",
-                        component: "dxos.org/plugin/space/CreateObjectDialog",
-                        dialogBlockAlign: "start",
-                        subject: intent.data
-                      }
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.lock",
+                    properties: {
+                      spaceId: space.id
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.ADD_OBJECT: {
-              const object = intent.data?.object ?? intent.data?.result;
-              if (!(0, import_live_object.isReactiveObject)(object)) {
-                return;
-              }
-              const space = (0, import_echo.isSpace)(intent.data?.target) ? intent.data?.target : (0, import_echo.getSpace)(intent.data?.target);
-              if (!space) {
-                return;
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Unlock, ({ space }) => {
+              space.properties[COMPOSER_SPACE_LOCK] = false;
+              return {
+                intents: [
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.unlock",
+                    properties: {
+                      spaceId: space.id
+                    }
+                  })
+                ]
+              };
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Rename, ({ caller, space }) => {
+              return {
+                intents: [
+                  (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                    element: "popover",
+                    anchorId: `dxos.org/ui/${caller}/${space.id}`,
+                    component: POPOVER_RENAME_SPACE,
+                    subject: space
+                  })
+                ]
+              };
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.OpenSettings, ({ space }) => {
+              return {
+                intents: [
+                  (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                    element: "dialog",
+                    component: SPACE_SETTINGS_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      space,
+                      initialTab: "settings",
+                      createInvitationUrl: createSpaceInvitationUrl
+                    }
+                  })
+                ]
+              };
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Open, async ({ space }) => {
+              await space.open();
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Close, async ({ space }) => {
+              await space.close();
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.Migrate, async ({ space, version }) => {
+              if (space.state.get() === import_echo.SpaceState.SPACE_REQUIRES_MIGRATION) {
+                state.values.sdkMigrationRunning[space.id] = true;
+                await space.internal.migrate();
+                state.values.sdkMigrationRunning[space.id] = false;
               }
+              const result = await import_migrations.Migrations.migrate(space, version);
+              return {
+                data: result,
+                intents: [
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.migrate",
+                    properties: {
+                      spaceId: space.id,
+                      version
+                    }
+                  })
+                ]
+              };
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.OpenCreateObject, ({ target, navigable = true }) => {
+              return {
+                intents: [
+                  (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                    element: "dialog",
+                    component: CREATE_OBJECT_DIALOG,
+                    dialogBlockAlign: "start",
+                    subject: {
+                      target,
+                      shouldNavigate: navigable ? (object) => !(object instanceof import_chunk_YF2AQ7KP.CollectionType) || state.values.navigableCollections : () => false
+                    }
+                  })
+                ]
+              };
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.AddObject, async ({ target, object }) => {
+              const space = (0, import_echo.isSpace)(target) ? target : (0, import_echo.getSpace)(target);
+              (0, import_invariant.invariant)(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((0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "toast",
+                  subject: {
+                    id: `${import_chunk_46S3JOES.SPACE_PLUGIN}/space-limit`,
+                    title: [
+                      "space limit label",
                       {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "toast",
-                          subject: {
-                            id: `${import_chunk_QNVEU2UD.SPACE_PLUGIN}/space-limit`,
-                            title: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["space limit label"],
-                            description: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["space limit description"],
-                            duration: 5e3,
-                            icon: "ph--warning--regular",
-                            actionLabel: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["remove deleted objects label"],
-                            actionAlt: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["remove deleted objects alt"],
-                            // TODO(wittjosiah): Use OS namespace.
-                            closeLabel: translations_default[0]["en-US"][import_chunk_QNVEU2UD.SPACE_PLUGIN]["space limit close label"],
-                            onAction: () => space.db.coreDatabase.unlinkDeletedObjects()
-                          }
-                        }
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
                       }
                     ],
-                    [
+                    description: [
+                      "space limit description",
                       {
-                        action: import_meta.ObservabilityAction.SEND_EVENT,
-                        data: {
-                          name: "space.limit",
-                          properties: {
-                            spaceId: space.id
-                          }
-                        }
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
                       }
-                    ]
-                  ]
-                };
+                    ],
+                    duration: 5e3,
+                    icon: "ph--warning--regular",
+                    actionLabel: [
+                      "remove deleted objects label",
+                      {
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
+                      }
+                    ],
+                    actionAlt: [
+                      "remove deleted objects alt",
+                      {
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
+                      }
+                    ],
+                    closeLabel: [
+                      "close label",
+                      {
+                        ns: "os"
+                      }
+                    ],
+                    onAction: () => space.db.coreDatabase.unlinkDeletedObjects()
+                  }
+                }));
+                void dispatch((0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                  name: "space.limit",
+                  properties: {
+                    spaceId: space.id
+                  }
+                }));
+                throw new Error("Space limit reached.");
               }
-              if (intent.data?.target instanceof import_chunk_6SNOZF7Y.CollectionType) {
-                intent.data?.target.objects.push(object);
-              } else if ((0, import_echo.isSpace)(intent.data?.target)) {
-                const collection = space.properties[import_chunk_6SNOZF7Y.CollectionType.typename];
-                if (collection instanceof import_chunk_6SNOZF7Y.CollectionType) {
-                  collection.objects.push(object);
+              if (target instanceof import_chunk_YF2AQ7KP.CollectionType) {
+                target.objects.push((0, import_live_object.makeRef)(object));
+              } else if ((0, import_echo.isSpace)(target)) {
+                const collection = space.properties[import_chunk_YF2AQ7KP.CollectionType.typename]?.target;
+                if (collection instanceof import_chunk_YF2AQ7KP.CollectionType) {
+                  collection.objects.push((0, import_live_object.makeRef)(object));
                 } else {
-                  const collection2 = (0, import_live_object.create)(import_chunk_6SNOZF7Y.CollectionType, {
+                  const collection2 = (0, import_live_object.create)(import_chunk_YF2AQ7KP.CollectionType, {
                     objects: [
-                      object
+                      (0, import_live_object.makeRef)(object)
                     ],
                     views: {}
                   });
-                  space.properties[import_chunk_6SNOZF7Y.CollectionType.typename] = collection2;
+                  space.properties[import_chunk_YF2AQ7KP.CollectionType.typename] = (0, import_live_object.makeRef)(collection2);
                 }
               }
               return {
@@ -3352,178 +3344,147 @@ var SpacePlugin = ({ invitationUrl = window.location.origin, invitationParam = "
                   }
                 },
                 intents: [
-                  [
-                    {
-                      action: import_meta.ObservabilityAction.SEND_EVENT,
-                      data: {
-                        name: "space.object.add",
-                        properties: {
-                          spaceId: space.id,
-                          objectId: object.id,
-                          typename: (0, import_echo.getTypename)(object)
-                        }
-                      }
+                  (0, import_app_framework.createIntent)(import_types2.ObservabilityAction.SendEvent, {
+                    name: "space.object.add",
+                    properties: {
+                      spaceId: space.id,
+                      objectId: object.id,
+                      typename: (0, import_echo.getTypename)(object)
                     }
-                  ]
+                  })
                 ]
               };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.REMOVE_OBJECTS: {
-              const objects = intent.data?.objects ?? intent.data?.result;
-              (0, import_invariant.invariant)(Array.isArray(objects), void 0, {
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.RemoveObjects, async ({ objects, target, deletionData }, undo) => {
+              const space = (0, import_echo.getSpace)(objects[0]);
+              (0, import_invariant.invariant)(space && objects.every((obj) => (0, import_echo.isEchoObject)(obj) && (0, import_echo.getSpace)(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 = (0, import_echo.getSpace)(objects[0]);
-              if (!space || !objects.every((obj) => (0, import_echo.isEchoObject)(obj) && (0, import_echo.getSpace)(obj) === space)) {
-                return;
-              }
-              const resolve = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
-              const activeParts = navigationPlugin?.provides.location.active;
               const openObjectIds = new Set((0, import_app_framework.openIds)(activeParts ?? {}));
-              if (!intent.undo && resolve) {
-                const parentCollection = intent.data?.collection ?? space.properties[import_chunk_6SNOZF7Y.CollectionType.typename];
+              if (!undo) {
+                const parentCollection = target ?? space.properties[import_chunk_YF2AQ7KP.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 import_chunk_6SNOZF7Y.CollectionType ? parentCollection.objects.indexOf(obj) : -1),
+                  indices: objects.map((obj) => parentCollection instanceof import_chunk_YF2AQ7KP.CollectionType ? parentCollection.objects.findIndex((object) => object.target === obj) : -1),
                   nestedObjectsList,
                   wasActive: objects.flatMap((obj, i) => [
                     obj,
                     ...nestedObjectsList[i]
                   ]).map((obj) => (0, import_echo.fullyQualifiedId)(obj)).filter((id) => openObjectIds.has(id))
                 };
-                if (deletionData.wasActive.length > 0) {
-                  await intentPlugin?.provides.intent.dispatch({
-                    action: import_app_framework.NavigationAction.CLOSE,
-                    data: {
-                      activeParts: {
-                        main: deletionData.wasActive,
-                        sidebar: deletionData.wasActive
-                      }
-                    }
-                  });
-                }
-                if (deletionData.parentCollection instanceof import_chunk_6SNOZF7Y.CollectionType) {
+                if (deletionData2.parentCollection instanceof import_chunk_YF2AQ7KP.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 import_chunk_6SNOZF7Y.CollectionType) ? "collection deleted label" : objects.length > 1 ? "objects deleted label" : "object deleted label";
+                const undoMessageKey = objects.some((obj) => obj instanceof import_chunk_YF2AQ7KP.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"][import_chunk_QNVEU2UD.SPACE_PLUGIN][undoMessageKey],
-                    data: deletionData
-                  }
+                    message: [
+                      undoMessageKey,
+                      {
+                        ns: import_chunk_46S3JOES.SPACE_PLUGIN
+                      }
+                    ],
+                    data: {
+                      deletionData: deletionData2
+                    }
+                  },
+                  intents: deletionData2.wasActive.length > 0 ? [
+                    (0, import_app_framework.createIntent)(import_app_framework.NavigationAction.Close, {
+                      activeParts: {
+                        main: deletionData2.wasActive
+                      }
+                    })
+                  ] : void 0
                 };
               } else {
-                const undoData = intent.data;
-                if (undoData?.objects?.length && undoData.objects.every(import_echo.isEchoObject) && undoData.parentCollection instanceof import_chunk_6SNOZF7Y.CollectionType) {
-                  const restoredObjects = undoData.objects.map((obj) => space.db.add(obj));
-                  undoData.nestedObjectsList.flat().forEach((obj) => {
+                if (deletionData?.objects?.length && deletionData.objects.every(import_echo.isEchoObject) && deletionData.parentCollection instanceof import_chunk_YF2AQ7KP.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, (0, import_live_object.makeRef)(restoredObjects[i]));
                     }
                   });
-                  if (undoData.wasActive.length > 0) {
-                    await intentPlugin?.provides.intent.dispatch({
-                      action: import_app_framework.NavigationAction.OPEN,
-                      data: {
+                  return {
+                    intents: deletionData.wasActive.length > 0 ? [
+                      (0, import_app_framework.createIntent)(import_app_framework.NavigationAction.Open, {
                         activeParts: {
-                          main: undoData.wasActive
+                          main: deletionData.wasActive
                         }
-                      }
-                    });
-                  }
-                  return {
-                    data: true
+                      })
+                    ] : void 0
                   };
                 }
-                return {
-                  data: false
-                };
-              }
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.RENAME_OBJECT: {
-              const object = intent.data?.object ?? intent.data?.result;
-              const caller = intent.data?.caller;
-              if ((0, import_live_object.isReactiveObject)(object) && caller) {
-                return {
-                  intents: [
-                    [
-                      {
-                        action: import_app_framework.LayoutAction.SET_LAYOUT,
-                        data: {
-                          element: "popover",
-                          anchorId: `dxos.org/ui/${caller}/${(0, import_echo.fullyQualifiedId)(object)}`,
-                          component: "dxos.org/plugin/space/RenameObjectPopover",
-                          subject: object
-                        }
-                      }
-                    ]
-                  ]
-                };
               }
-              break;
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.DUPLICATE_OBJECT: {
-              const originalObject = intent.data?.object ?? intent.data?.result;
-              const resolve = (0, import_app_framework.resolvePlugin)(plugins, import_app_framework.parseMetadataResolverPlugin)?.provides.metadata.resolver;
-              const space = (0, import_echo.isSpace)(intent.data?.target) ? intent.data?.target : (0, import_echo.getSpace)(intent.data?.target);
-              if (!(0, import_echo.isEchoObject)(originalObject) || !resolve || !space) {
-                return;
-              }
-              const newObject = await cloneObject(originalObject, resolve, space);
-              return {
-                intents: [
-                  [
-                    {
-                      action: import_chunk_QNVEU2UD.SpaceAction.ADD_OBJECT,
-                      data: {
-                        object: newObject,
-                        target: intent.data?.target
-                      }
-                    }
-                  ]
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.RenameObject, async ({ object, caller }) => ({
+              intents: [
+                (0, import_app_framework.createIntent)(import_app_framework.LayoutAction.SetLayout, {
+                  element: "popover",
+                  anchorId: `dxos.org/ui/${caller}/${(0, import_echo.fullyQualifiedId)(object)}`,
+                  component: POPOVER_RENAME_OBJECT,
+                  subject: object
+                })
+              ]
+            })),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.DuplicateObject, async ({ object, target }) => {
+              const space = (0, import_echo.isSpace)(target) ? target : (0, import_echo.getSpace)(target);
+              (0, import_invariant.invariant)(space, "Space not found.", {
+                F: __dxlog_file6,
+                L: 1429,
+                S: void 0,
+                A: [
+                  "space",
+                  "'Space not found.'"
                 ]
-              };
-            }
-            case import_chunk_QNVEU2UD.SpaceAction.TOGGLE_HIDDEN: {
-              settings.values.showHidden = intent.data?.state ?? !settings.values.showHidden;
-              return {
-                data: true
-              };
-            }
-            case import_chunk_QNVEU2UD.CollectionAction.CREATE: {
-              const collection = (0, import_live_object.create)(import_chunk_6SNOZF7Y.CollectionType, {
-                name: intent.data?.name,
-                objects: [],
-                views: {}
               });
+              const newObject = await cloneObject(object, resolve, space);
               return {
-                data: collection
+                intents: [
+                  (0, import_app_framework.createIntent)(import_chunk_YF2AQ7KP.SpaceAction.AddObject, {
+                    object: newObject,
+                    target
+                  })
+                ]
               };
-            }
-          }
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.WaitForObject, async ({ id }) => {
+              state.values.awaiting = id;
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.SpaceAction.ToggleHidden, async ({ state: state2 }) => {
+              settings.values.showHidden = state2;
+            }),
+            (0, import_app_framework.createResolver)(import_chunk_YF2AQ7KP.CollectionAction.Create, async ({ name }) => ({
+              data: {
+                object: (0, import_live_object.create)(import_chunk_YF2AQ7KP.CollectionType, {
+                  name,
+                  objects: [],
+                  views: {}
+                })
+              }
+            }))
+          ];
         }
       }
     }
@@ -3535,6 +3496,8 @@ var src_default = SpacePlugin;
   ActorSchema,
   AwaitingObject,
   COMPOSER_SPACE_LOCK,
+  CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG,
   ChannelType,
   CollectionAction,
   CollectionMain,
@@ -3546,19 +3509,23 @@ var src_default = SpacePlugin;
   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,