@dxos/plugin-space 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/dist/lib/node-esm/{chunk-DG5YEEPZ.mjs → chunk-MI4A5XUX.mjs}

@@ -1,40 +1,43 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   useInputSurfaceLookup,
-  usePath
-} from "./chunk-PAAWJ4RE.mjs";
+  usePath,
+  useTypeOptions
+} from "./chunk-FAWIRIP4.mjs";
 import {
   SpaceCapabilities
-} from "./chunk-H5UPFRRH.mjs";
+} from "./chunk-Z7BB6HC2.mjs";
 import {
   COMPOSER_SPACE_LOCK,
   getSpaceDisplayName
-} from "./chunk-TNUWML33.mjs";
+} from "./chunk-HQMFTMJE.mjs";
 import {
   SpaceAction,
   SpaceForm
-} from "./chunk-4F25JKVT.mjs";
+} from "./chunk-2PN7QNGV.mjs";
 import {
   meta
-} from "./chunk-MWNATOXL.mjs";
+} from "./chunk-BDEFTL6K.mjs";
 
 // src/components/AwaitingObject.tsx
 import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import React, { useCallback, useEffect, useState } from "react";
-import { LayoutAction, createIntent, useIntentDispatcher, useLayout } from "@dxos/app-framework";
+import { LayoutAction, createIntent } from "@dxos/app-framework";
+import { useIntentDispatcher, useLayout } from "@dxos/app-framework/react";
+import { Obj } from "@dxos/echo";
 import { useClient } from "@dxos/react-client";
-import { Filter, fullyQualifiedId, useQuery } from "@dxos/react-client/echo";
+import { Filter, useQuery } from "@dxos/react-client/echo";
 import { Button, Icon, Toast, useTranslation } from "@dxos/react-ui";
-var WAIT_FOR_OBJECT_TIMEOUT = 18e4;
-var TOAST_TIMEOUT = 24e4;
+var WAIT_FOR_OBJECT_TIMEOUT = 3 * 60 * 1e3;
+var TOAST_TIMEOUT = 4 * 60 * 1e3;
 var AwaitingObject = ({ id }) => {
   var _effect = _useSignals();
   try {
+    const { t } = useTranslation(meta.id);
+    const { dispatchPromise: dispatch } = useIntentDispatcher();
     const [open, setOpen] = useState(true);
     const [waiting, setWaiting] = useState(true);
     const [found, setFound] = useState(false);
-    const { t } = useTranslation(meta.id);
-    const { dispatchPromise: dispatch } = useIntentDispatcher();
     const layout = useLayout();
     const client = useClient();
     const objects = useQuery(client.spaces, Filter.everything());
@@ -42,15 +45,13 @@ var AwaitingObject = ({ id }) => {
       if (!id) {
         return;
       }
-      const timeout = setTimeout(() => {
-        setWaiting(false);
-      }, WAIT_FOR_OBJECT_TIMEOUT);
-      () => clearTimeout(timeout);
+      const timeout = setTimeout(() => setWaiting(false), WAIT_FOR_OBJECT_TIMEOUT);
+      return () => clearTimeout(timeout);
     }, [
       id
     ]);
     useEffect(() => {
-      if (objects.findIndex((object) => fullyQualifiedId(object) === id) > -1) {
+      if (objects.findIndex((object) => Obj.getDXN(object).toString() === id) > -1) {
         setFound(true);
         if (layout.active.includes(id)) {
           setOpen(false);
@@ -122,16 +123,17 @@ var AwaitingObject = ({ id }) => {
 // src/components/CreateDialog/CreateObjectDialog.tsx
 import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
 import * as Effect from "effect/Effect";
-import * as Function from "effect/Function";
+import * as Function2 from "effect/Function";
 import React3, { useCallback as useCallback3, useRef, useState as useState2 } from "react";
-import { Capabilities, LayoutAction as LayoutAction2, chain, createIntent as createIntent2, useCapabilities, useIntentDispatcher as useIntentDispatcher2, usePluginManager } from "@dxos/app-framework";
-import { Obj, Query, Type as Type2 } from "@dxos/echo";
+import { Capabilities, LayoutAction as LayoutAction2, chain, createIntent as createIntent2 } from "@dxos/app-framework";
+import { useCapabilities, useIntentDispatcher as useIntentDispatcher2, usePluginManager } from "@dxos/app-framework/react";
+import { Obj as Obj2, Query, Type as Type2 } from "@dxos/echo";
 import { invariant } from "@dxos/invariant";
 import { useClient as useClient2 } from "@dxos/react-client";
 import { getSpace, isLiveObject, isSpace, useQuery as useQuery2, useSpaces } from "@dxos/react-client/echo";
-import { Button as Button2, Dialog, Icon as Icon3, useTranslation as useTranslation3 } from "@dxos/react-ui";
+import { Dialog, IconButton, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { cardDialogContent, cardDialogHeader } from "@dxos/react-ui-stack";
-import { DataType, getTypenameFromQuery } from "@dxos/schema";
+import { Collection, StoredSchema, getTypenameFromQuery } from "@dxos/schema";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 
 // src/components/CreateDialog/CreateObjectPanel.tsx
@@ -301,18 +303,18 @@ var CREATE_OBJECT_DIALOG = `${meta.id}/CreateObjectDialog`;
 var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, views, initialFormValues, onCreateObject, shouldNavigate: _shouldNavigate }) => {
   var _effect = _useSignals3();
   try {
-    const closeRef = useRef(null);
     const manager = usePluginManager();
     const { t } = useTranslation3(meta.id);
-    const client = useClient2();
-    const spaces = useSpaces();
     const { dispatch } = useIntentDispatcher2();
     const forms = useCapabilities(SpaceCapabilities.ObjectForm);
     const [target, setTarget] = useState2(initialTarget);
     const [typename, setTypename] = useState2(initialTypename);
+    const client = useClient2();
+    const spaces = useSpaces();
     const space = isSpace(target) ? target : getSpace(target);
-    const queryCollections = useQuery2(space, Query.type(DataType.QueryCollection));
+    const queryCollections = useQuery2(space, Query.type(Collection.QueryCollection));
     const hiddenTypenames = queryCollections.map((collection) => getTypenameFromQuery(collection.query)).filter(isNonNullable2);
+    const closeRef = useRef(null);
     const resolve = useCallback3((typename2) => manager.context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename2)?.metadata ?? {}, [
       manager
     ]);
@@ -324,7 +326,7 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
       const space2 = isSpace(target) ? target : getSpace(target);
       invariant(space2, "Missing space", {
         F: __dxlog_file,
-        L: 84,
+        L: 77,
         S: this,
         A: [
           "space",
@@ -334,7 +336,7 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
       const { object } = yield* dispatch(form.getIntent(data, {
         space: space2
       }));
-      if (isLiveObject(object) && !Obj.instanceOf(DataType.StoredSchema, object)) {
+      if (isLiveObject(object) && !Obj2.instanceOf(StoredSchema, object)) {
         const hidden = form.hidden || hiddenTypenames.includes(Type2.getTypename(form.objectSchema));
         const addObjectIntent = createIntent2(SpaceAction.AddObject, {
           target,
@@ -343,7 +345,7 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
         });
         const shouldNavigate = _shouldNavigate ?? (() => true);
         if (shouldNavigate(object)) {
-          yield* dispatch(Function.pipe(addObjectIntent, chain(LayoutAction2.Open, {
+          yield* dispatch(Function2.pipe(addObjectIntent, chain(LayoutAction2.Open, {
             part: "main"
           })));
         } else {
@@ -373,15 +375,16 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
         })
       })), /* @__PURE__ */ React3.createElement(Dialog.Close, {
         asChild: true
-      }, /* @__PURE__ */ React3.createElement(Button2, {
+      }, /* @__PURE__ */ React3.createElement(IconButton, {
         ref: closeRef,
+        icon: "ph--x--regular",
+        size: 4,
+        label: "Close",
+        iconOnly: true,
         density: "fine",
         variant: "ghost",
         autoFocus: true
-      }, /* @__PURE__ */ React3.createElement(Icon3, {
-        icon: "ph--x--regular",
-        size: 4
-      })))), /* @__PURE__ */ React3.createElement(CreateObjectPanel, {
+      }))), /* @__PURE__ */ React3.createElement(CreateObjectPanel, {
         forms,
         spaces,
         target,
@@ -404,8 +407,9 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
 import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
 import * as Effect2 from "effect/Effect";
 import React4, { useCallback as useCallback4, useRef as useRef2 } from "react";
-import { LayoutAction as LayoutAction3, createIntent as createIntent3, useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework";
-import { Button as Button3, Dialog as Dialog2, Icon as Icon4, useTranslation as useTranslation4 } from "@dxos/react-ui";
+import { LayoutAction as LayoutAction3, createIntent as createIntent3 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher3 } from "@dxos/app-framework/react";
+import { Dialog as Dialog2, IconButton as IconButton2, useTranslation as useTranslation4 } from "@dxos/react-ui";
 import { Form as Form2 } from "@dxos/react-ui-form";
 import { cardDialogContent as cardDialogContent2, cardDialogHeader as cardDialogHeader2 } from "@dxos/react-ui-stack";
 var CREATE_SPACE_DIALOG = `${meta.id}/CreateSpaceDialog`;
@@ -447,15 +451,16 @@ var CreateSpaceDialog = () => {
         className: cardDialogHeader2
       }, /* @__PURE__ */ React4.createElement(Dialog2.Title, null, t("create space dialog title")), /* @__PURE__ */ React4.createElement(Dialog2.Close, {
         asChild: true
-      }, /* @__PURE__ */ React4.createElement(Button3, {
+      }, /* @__PURE__ */ React4.createElement(IconButton2, {
         ref: closeRef,
+        icon: "ph--x--regular",
+        size: 4,
+        label: "Close",
+        iconOnly: true,
         density: "fine",
         variant: "ghost",
         autoFocus: true
-      }, /* @__PURE__ */ React4.createElement(Icon4, {
-        icon: "ph--x--regular",
-        size: 4
-      })))), /* @__PURE__ */ React4.createElement("div", {
+      }))), /* @__PURE__ */ React4.createElement("div", {
         role: "none",
         className: "contents"
       }, /* @__PURE__ */ React4.createElement(Form2, {
@@ -477,24 +482,26 @@ var CreateSpaceDialog = () => {
 import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
 import React5 from "react";
 import { useTranslation as useTranslation5 } from "@dxos/react-ui";
-var CollectionSection = ({ collection }) => {
+var CollectionSection = ({ role, object }) => {
   var _effect = _useSignals5();
   try {
     const { t } = useTranslation5(meta.id);
     return /* @__PURE__ */ React5.createElement("div", {
+      role,
       className: "min-bs-[3.5rem] grid grid-rows-subgrid grid-cols-subgrid items-center"
     }, /* @__PURE__ */ React5.createElement("span", {
       className: "truncate"
-    }, collection.name ?? t("unnamed collection label")));
+    }, object.name ?? t("unnamed collection label")));
   } finally {
     _effect.f();
   }
 };
 
-// src/components/JoinDialog.tsx
+// src/components/JoinDialog/JoinDialog.tsx
 import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
 import React6, { useCallback as useCallback5 } from "react";
-import { LayoutAction as LayoutAction4, createIntent as createIntent4, useAppGraph, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework";
+import { LayoutAction as LayoutAction4, createIntent as createIntent4 } from "@dxos/app-framework";
+import { useAppGraph, useIntentDispatcher as useIntentDispatcher4 } from "@dxos/app-framework/react";
 import { Trigger } from "@dxos/async";
 import { ObservabilityAction } from "@dxos/plugin-observability/types";
 import { useClient as useClient3 } from "@dxos/react-client";
@@ -607,22 +614,24 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
   }
 };
 
-// src/components/MembersContainer.tsx
+// src/components/MembersContainer/MembersContainer.tsx
 import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
 import React7, { useCallback as useCallback6, useMemo, useState as useState3 } from "react";
 import { QR } from "react-qr-rounded";
-import { createIntent as createIntent5, useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework";
+import { createIntent as createIntent5 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework/react";
+import { Obj as Obj3 } from "@dxos/echo";
 import { log } from "@dxos/log";
 import { useConfig } from "@dxos/react-client";
-import { fullyQualifiedId as fullyQualifiedId2, useSpaceInvitations } from "@dxos/react-client/echo";
+import { useSpaceInvitations } from "@dxos/react-client/echo";
 import { Invitation, InvitationEncoder } from "@dxos/react-client/invitations";
-import { Button as Button4, Clipboard, Icon as Icon5, Input, useId, useTranslation as useTranslation7 } from "@dxos/react-ui";
+import { Button as Button2, Clipboard, Icon as Icon3, Input, useId, useTranslation as useTranslation7 } from "@dxos/react-ui";
 import { ControlFrame, ControlFrameItem, ControlItemInput, ControlPage, ControlSection } from "@dxos/react-ui-form";
 import { StackItem } from "@dxos/react-ui-stack";
-import { DataType as DataType2 } from "@dxos/schema";
+import { Collection as Collection2 } from "@dxos/schema";
 import { AuthCode, BifurcatedAction, Centered, Emoji, InvitationList, SpaceMemberList, Viewport } from "@dxos/shell/react";
 import { hexToEmoji } from "@dxos/util";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/MembersContainer.tsx";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/MembersContainer/MembersContainer.tsx";
 var activeActionKey = "dxos:react-shell/space-manager/active-action";
 var handleInvitationEvent = (invitation, subscription) => {
   const invitationCode = InvitationEncoder.encode(invitation);
@@ -632,7 +641,7 @@ var handleInvitationEvent = (invitation, subscription) => {
       authCode: invitation.authCode
     }), void 0, {
       F: __dxlog_file2,
-      L: 39,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -654,7 +663,7 @@ var MembersContainer = ({ space, createInvitationUrl }) => {
       setInternalActiveAction(nextAction);
       localStorage.setItem(activeActionKey, nextAction);
     };
-    const target = space.properties[DataType2.Collection.typename]?.target?.objects[0]?.target;
+    const target = space.properties[Collection2.Collection.typename]?.target?.objects[0]?.target;
     const locked = space.properties[COMPOSER_SPACE_LOCK];
     const handleChangeLocked = useCallback6(() => {
       space.properties[COMPOSER_SPACE_LOCK] = !locked;
@@ -678,7 +687,7 @@ var MembersContainer = ({ space, createInvitationUrl }) => {
             type: Invitation.Type.INTERACTIVE,
             authMethod: Invitation.AuthMethod.SHARED_SECRET,
             multiUse: false,
-            target: target && fullyQualifiedId2(target)
+            target: target && Obj3.getDXN(target).toString()
           }));
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== "production") {
             const subscription = invitation.subscribe((invitation2) => handleInvitationEvent(invitation2, subscription));
@@ -700,7 +709,7 @@ var MembersContainer = ({ space, createInvitationUrl }) => {
             type: Invitation.Type.DELEGATED,
             authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
             multiUse: true,
-            target: target && fullyQualifiedId2(target)
+            target: target && Obj3.getDXN(target).toString()
           }));
           if (invitation && config.values.runtime?.app?.env?.DX_ENVIRONMENT !== "production") {
             const subscription = invitation.subscribe((invitation2) => handleInvitationEvent(invitation2, subscription));
@@ -824,7 +833,7 @@ var InvitationQR = ({ id, url, onCancel }) => {
       className: "sr-only"
     }, t("qr label")), /* @__PURE__ */ React7.createElement(Clipboard.Button, {
       value: url ?? "never"
-    })), /* @__PURE__ */ React7.createElement(Button4, {
+    })), /* @__PURE__ */ React7.createElement(Button2, {
       variant: "ghost",
       onClick: onCancel
     }, t("cancel label")));
@@ -848,7 +857,7 @@ var InvitationAuthCode = ({ id, code, onCancel }) => {
       code,
       large: true,
       classNames: "mli-auto mlb-2 text-center grow"
-    }), /* @__PURE__ */ React7.createElement(Button4, {
+    }), /* @__PURE__ */ React7.createElement(Button2, {
       variant: "ghost",
       onClick: onCancel
     }, t("cancel label")));
@@ -859,11 +868,11 @@ var InvitationAuthCode = ({ id, code, onCancel }) => {
 var InvitationComplete = ({ statusValue }) => {
   var _effect = _useSignals7();
   try {
-    return statusValue > 0 ? /* @__PURE__ */ React7.createElement(Icon5, {
+    return statusValue > 0 ? /* @__PURE__ */ React7.createElement(Icon3, {
       icon: "ph--check--regular",
       size: 6,
       classNames: "m-1.5"
-    }) : /* @__PURE__ */ React7.createElement(Icon5, {
+    }) : /* @__PURE__ */ React7.createElement(Icon3, {
       icon: "ph--x--regular",
       size: 6,
       classNames: "m-1.5"
@@ -878,7 +887,7 @@ import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking"
 import React8 from "react";
 import { getSpace as getSpace2 } from "@dxos/client/echo";
 import { useClient as useClient4 } from "@dxos/react-client";
-import { DropdownMenu, Icon as Icon6, toLocalizedString as toLocalizedString2, useTranslation as useTranslation8 } from "@dxos/react-ui";
+import { DropdownMenu, Icon as Icon4, toLocalizedString as toLocalizedString2, useTranslation as useTranslation8 } from "@dxos/react-ui";
 var MenuFooter = ({ object }) => {
   var _effect = _useSignals8();
   try {
@@ -894,7 +903,7 @@ var MenuFooter = ({ object }) => {
       className: "uppercase text-[.75em] tracking-wide font-medium mbs-px self-start"
     }, t("location label")), /* @__PURE__ */ React8.createElement("dd", {
       className: "line-clamp-3"
-    }, /* @__PURE__ */ React8.createElement(Icon6, {
+    }, /* @__PURE__ */ React8.createElement(Icon4, {
       icon: "ph--planet--regular",
       classNames: "inline-block mie-1"
     }), toLocalizedString2(spaceName, t)))) : null;
@@ -903,90 +912,26 @@ var MenuFooter = ({ object }) => {
   }
 };
 
-// src/components/PersistenceStatus.tsx
+// src/components/ObjectRenamePopover/ObjectRenamePopover.tsx
 import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
-import React9, { useEffect as useEffect2, useState as useState4 } from "react";
-import { debounce } from "@dxos/async";
-import { Icon as Icon7, Tooltip, useTranslation as useTranslation9 } from "@dxos/react-ui";
-import { mx, staticPlaceholderText, warningText } from "@dxos/react-ui-theme";
-var PersistenceStatus = ({ db }) => {
+import React9, { useCallback as useCallback7, useRef as useRef3, useState as useState4 } from "react";
+import { LayoutAction as LayoutAction5, createIntent as createIntent6 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher6 } from "@dxos/app-framework/react";
+import { Obj as Obj4 } from "@dxos/echo";
+import { log as log2 } from "@dxos/log";
+import { Button as Button3, Input as Input2, useTranslation as useTranslation9 } from "@dxos/react-ui";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/ObjectRenamePopover/ObjectRenamePopover.tsx";
+var OBJECT_RENAME_POPOVER = `${meta.id}/ObjectRenamePopover`;
+var ObjectRenamePopover = ({ object }) => {
   var _effect = _useSignals9();
   try {
     const { t } = useTranslation9(meta.id);
-    const [displayMessage, setDisplayMessage] = useState4(false);
-    const [status, naturalSetStatus] = useState4(0);
-    const [prevStatus, setPrevStatus] = useState4(0);
-    const _setStatus = debounce(naturalSetStatus, 500);
-    useEffect2(() => {
-      setPrevStatus(status);
-      if (prevStatus !== status && status === 0) {
-        setDisplayMessage(true);
-        const timeout = setTimeout(() => setDisplayMessage(false), 5e3);
-        return () => clearTimeout(timeout);
-      }
-    }, [
-      status
-    ]);
-    switch (status) {
-      case 2:
-        return /* @__PURE__ */ React9.createElement("div", {
-          className: "flex items-center"
-        }, /* @__PURE__ */ React9.createElement(Icon7, {
-          icon: "ph--warning--regular",
-          size: 4,
-          classNames: "me-1"
-        }), /* @__PURE__ */ React9.createElement("span", {
-          className: mx("text-sm", warningText)
-        }, t("persistence error label")));
-      case 1:
-        return /* @__PURE__ */ React9.createElement("div", {
-          className: "flex items-center"
-        }, /* @__PURE__ */ React9.createElement(Icon7, {
-          icon: "ph--arrows-counter-clockwise--regular",
-          size: 4,
-          classNames: "me-1"
-        }), /* @__PURE__ */ React9.createElement("span", {
-          className: mx("text-sm", staticPlaceholderText)
-        }, t("persistence pending label")));
-      case 0:
-      default:
-        return /* @__PURE__ */ React9.createElement(Tooltip.Trigger, {
-          delayDuration: 400,
-          role: "status",
-          content: t("persisted locally message"),
-          className: "flex items-center"
-        }, /* @__PURE__ */ React9.createElement(Icon7, {
-          icon: "ph--check-circle--regular",
-          size: 4,
-          classNames: "me-1"
-        }), displayMessage && /* @__PURE__ */ React9.createElement("span", {
-          className: mx("text-sm", staticPlaceholderText)
-        }, t("persisted locally label")));
-    }
-  } finally {
-    _effect.f();
-  }
-};
-
-// src/components/PopoverRenameObject.tsx
-import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
-import React10, { useCallback as useCallback7, useRef as useRef3, useState as useState5 } from "react";
-import { LayoutAction as LayoutAction5, createIntent as createIntent6, useIntentDispatcher as useIntentDispatcher6 } from "@dxos/app-framework";
-import { Obj as Obj2 } from "@dxos/echo";
-import { log as log2 } from "@dxos/log";
-import { Button as Button5, Input as Input2, useTranslation as useTranslation10 } from "@dxos/react-ui";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/PopoverRenameObject.tsx";
-var POPOVER_RENAME_OBJECT = `${meta.id}/PopoverRenameObject`;
-var PopoverRenameObject = ({ object }) => {
-  var _effect = _useSignals10();
-  try {
-    const { t } = useTranslation10(meta.id);
     const doneButton = useRef3(null);
-    const [name, setName] = useState5(Obj2.getLabel(object));
+    const [name, setName] = useState4(Obj4.getLabel(object));
     const { dispatchPromise: dispatch } = useIntentDispatcher6();
     const handleDone = useCallback7(() => {
       try {
-        name && Obj2.setLabel(object, name);
+        name && Obj4.setLabel(object, name);
       } catch (err) {
         log2.error("Failed to rename object", {
           err
@@ -1009,21 +954,21 @@ var PopoverRenameObject = ({ object }) => {
       object,
       name
     ]);
-    return /* @__PURE__ */ React10.createElement("div", {
+    return /* @__PURE__ */ React9.createElement("div", {
       role: "none",
       className: "p-2 flex gap-2"
-    }, /* @__PURE__ */ React10.createElement("div", {
+    }, /* @__PURE__ */ React9.createElement("div", {
       role: "none",
       className: "flex-1"
-    }, /* @__PURE__ */ React10.createElement(Input2.Root, null, /* @__PURE__ */ React10.createElement(Input2.Label, {
+    }, /* @__PURE__ */ React9.createElement(Input2.Root, null, /* @__PURE__ */ React9.createElement(Input2.Label, {
       srOnly: true
-    }, t("object name label")), /* @__PURE__ */ React10.createElement(Input2.TextInput, {
+    }, t("object name label")), /* @__PURE__ */ React9.createElement(Input2.TextInput, {
       placeholder: t("object placeholder"),
       value: name,
       "data-testid": "spacePlugin.renameObject.input",
-      onChange: ({ target: { value } }) => setName(value),
+      onChange: ({ target: { value: value2 } }) => setName(value2),
       onKeyDown: ({ key }) => key === "Enter" && doneButton.current?.click()
-    }))), /* @__PURE__ */ React10.createElement(Button5, {
+    }))), /* @__PURE__ */ React9.createElement(Button3, {
       ref: doneButton,
       classNames: "self-stretch",
       onClick: handleDone
@@ -1035,18 +980,19 @@ var PopoverRenameObject = ({ object }) => {
   }
 };
 
-// src/components/PopoverRenameSpace.tsx
-import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
-import React11, { useCallback as useCallback8, useRef as useRef4, useState as useState6 } from "react";
-import { LayoutAction as LayoutAction6, createIntent as createIntent7, useIntentDispatcher as useIntentDispatcher7 } from "@dxos/app-framework";
-import { Button as Button6, Input as Input3, Popover, useTranslation as useTranslation11 } from "@dxos/react-ui";
-var POPOVER_RENAME_SPACE = `${meta.id}/PopoverRenameSpace`;
-var PopoverRenameSpace = ({ space }) => {
-  var _effect = _useSignals11();
+// src/components/SpaceRenamePopover/SpaceRenamePopover.tsx
+import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
+import React10, { useCallback as useCallback8, useRef as useRef4, useState as useState5 } from "react";
+import { LayoutAction as LayoutAction6, createIntent as createIntent7 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher7 } from "@dxos/app-framework/react";
+import { Button as Button4, Input as Input3, Popover, useTranslation as useTranslation10 } from "@dxos/react-ui";
+var SPACE_RENAME_POPOVER = `${meta.id}/SpaceRenamePopover`;
+var SpaceRenamePopover = ({ space }) => {
+  var _effect = _useSignals10();
   try {
-    const { t } = useTranslation11(meta.id);
+    const { t } = useTranslation10(meta.id);
     const doneButton = useRef4(null);
-    const [name, setName] = useState6(space.properties.name ?? "");
+    const [name, setName] = useState5(space.properties.name ?? "");
     const { dispatchPromise: dispatch } = useIntentDispatcher7();
     const handleDone = useCallback8(() => {
       space.properties.name = name;
@@ -1062,24 +1008,24 @@ var PopoverRenameSpace = ({ space }) => {
       space,
       name
     ]);
-    return /* @__PURE__ */ React11.createElement("div", {
+    return /* @__PURE__ */ React10.createElement("div", {
       role: "none",
       className: "p-2 flex gap-2"
-    }, /* @__PURE__ */ React11.createElement("div", {
+    }, /* @__PURE__ */ React10.createElement("div", {
       role: "none",
       className: "flex-1"
-    }, /* @__PURE__ */ React11.createElement(Input3.Root, null, /* @__PURE__ */ React11.createElement(Input3.Label, {
+    }, /* @__PURE__ */ React10.createElement(Input3.Root, null, /* @__PURE__ */ React10.createElement(Input3.Label, {
       srOnly: true
-    }, t("space name label")), /* @__PURE__ */ React11.createElement(Input3.TextInput, {
+    }, t("space name label")), /* @__PURE__ */ React10.createElement(Input3.TextInput, {
       defaultValue: space.properties.name ?? "",
       placeholder: t("unnamed space label"),
-      onChange: ({ target: { value } }) => setName(value),
+      onChange: ({ target: { value: value2 } }) => setName(value2),
       // TODO(wittjosiah): Ideally this should access the popover context to close the popover.
       //   Currently this is not possible because Radix does not expose the popover context.
       onKeyDown: ({ key }) => key === "Enter" && doneButton.current?.click()
-    }))), /* @__PURE__ */ React11.createElement(Popover.Close, {
+    }))), /* @__PURE__ */ React10.createElement(Popover.Close, {
       asChild: true
-    }, /* @__PURE__ */ React11.createElement(Button6, {
+    }, /* @__PURE__ */ React10.createElement(Button4, {
       ref: doneButton,
       classNames: "self-stretch",
       onClick: handleDone
@@ -1092,57 +1038,59 @@ var PopoverRenameSpace = ({ space }) => {
 };
 
 // src/components/SchemaContainer.tsx
-import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
-import React12, { useEffect as useEffect3, useState as useState7 } from "react";
-import { useTranslation as useTranslation12 } from "@dxos/react-ui";
+import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
+import React11, { useEffect as useEffect2, useState as useState6 } from "react";
+import { useTranslation as useTranslation11 } from "@dxos/react-ui";
 import { ControlPage as ControlPage2, ControlSection as ControlSection2, controlItemClasses } from "@dxos/react-ui-form";
 import { StackItem as StackItem2 } from "@dxos/react-ui-stack";
-var useQuerySpaceSchemas = (space) => {
-  const [schemas, setSchemas] = useState7([]);
-  useEffect3(() => {
-    const query = space.db.schemaRegistry.query();
-    const initialResults = query.runSync();
-    setSchemas(initialResults);
-    const unsubscribe = query.subscribe(() => setSchemas(query.results));
-    return () => unsubscribe();
-  }, [
-    space
-  ]);
-  return schemas;
-};
 var SchemaContainer = ({ space }) => {
-  var _effect = _useSignals12();
+  var _effect = _useSignals11();
   try {
-    const { t } = useTranslation12(meta.id);
+    const { t } = useTranslation11(meta.id);
     const schemas = useQuerySpaceSchemas(space);
-    return /* @__PURE__ */ React12.createElement(StackItem2.Content, {
+    return /* @__PURE__ */ React11.createElement(StackItem2.Content, {
       scrollable: true
-    }, /* @__PURE__ */ React12.createElement(ControlPage2, null, /* @__PURE__ */ React12.createElement(ControlSection2, {
+    }, /* @__PURE__ */ React11.createElement(ControlPage2, null, /* @__PURE__ */ React11.createElement(ControlSection2, {
       title: t("schema verbose label"),
       description: t("schema description")
-    }, /* @__PURE__ */ React12.createElement("div", {
+    }, /* @__PURE__ */ React11.createElement("div", {
       role: "none",
       className: controlItemClasses
-    }, schemas.length === 0 && /* @__PURE__ */ React12.createElement("div", {
+    }, schemas.length === 0 && /* @__PURE__ */ React11.createElement("div", {
       className: "text-center plb-4"
-    }, t("no schemas found message")), schemas.map((schema) => /* @__PURE__ */ React12.createElement("div", {
+    }, t("no schemas found message")), schemas.map((schema) => /* @__PURE__ */ React11.createElement("div", {
+      role: "none",
       key: schema.id
-    }, /* @__PURE__ */ React12.createElement("div", null, schema.typename)))))));
+    }, schema.typename))))));
   } finally {
     _effect.f();
   }
 };
+var useQuerySpaceSchemas = (space) => {
+  const [schemas, setSchemas] = useState6([]);
+  useEffect2(() => {
+    const query = space.db.schemaRegistry.query();
+    const initialResults = query.runSync();
+    setSchemas(initialResults);
+    const unsubscribe = query.subscribe(() => setSchemas(query.results));
+    return () => unsubscribe();
+  }, [
+    space
+  ]);
+  return schemas;
+};
 
-// src/components/SpacePresence.tsx
-import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
+// src/components/SpacePresence/SpacePresence.tsx
+import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
 import * as Option2 from "effect/Option";
-import React13, { forwardRef, useCallback as useCallback9, useEffect as useEffect4, useState as useState8 } from "react";
-import { useAppGraph as useAppGraph2, useCapability } from "@dxos/app-framework";
+import React12, { forwardRef, useCallback as useCallback9, useEffect as useEffect3, useState as useState7 } from "react";
+import { useAppGraph as useAppGraph2, useCapability } from "@dxos/app-framework/react";
 import { generateName } from "@dxos/display-name";
+import { Obj as Obj5 } from "@dxos/echo";
 import { PublicKey, useClient as useClient5 } from "@dxos/react-client";
-import { fullyQualifiedId as fullyQualifiedId3, getSpace as getSpace3, useMembers } from "@dxos/react-client/echo";
+import { getSpace as getSpace3, useMembers } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
-import { Avatar, List, ListItem, Popover as Popover2, Tooltip as Tooltip2, useDefaultValue as useDefaultValue2, useTranslation as useTranslation13 } from "@dxos/react-ui";
+import { Avatar, List, ListItem, Popover as Popover2, Tooltip, useDefaultValue as useDefaultValue2, useTranslation as useTranslation12 } from "@dxos/react-ui";
 import { AttentionGlyph, useAttended, useAttention } from "@dxos/react-ui-attention";
 import { ComplexMap, keyToFallback } from "@dxos/util";
 var REFRESH_INTERVAL = 5e3;
@@ -1150,15 +1098,15 @@ var ACTIVITY_DURATION = 3e4;
 var noViewers = new ComplexMap(PublicKey.hash);
 var getName = (identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 var SpacePresence = ({ object, spaceKey }) => {
-  var _effect = _useSignals13();
+  var _effect = _useSignals12();
   try {
     const spaceState = useCapability(SpaceCapabilities.MutableState);
     const client = useClient5();
     const identity = useIdentity();
     const space = spaceKey ? client.spaces.get(spaceKey) : getSpace3(object);
     const spaceMembers = useMembers(space?.key);
-    const [_moment, setMoment] = useState8(Date.now());
-    useEffect4(() => {
+    const [_moment, setMoment] = useState7(Date.now());
+    useEffect3(() => {
       const interval = setInterval(() => setMoment(Date.now()), REFRESH_INTERVAL);
       return () => clearInterval(interval);
     }, []);
@@ -1169,7 +1117,7 @@ var SpacePresence = ({ object, spaceKey }) => {
     if (!identity || !spaceState || !space) {
       return null;
     }
-    const currentObjectViewers = spaceState.viewersByObject[fullyQualifiedId3(object)] ?? noViewers;
+    const currentObjectViewers = spaceState.viewersByObject[Obj5.getDXN(object).toString()] ?? noViewers;
     const membersForObject = spaceMembers.filter((member) => memberOnline(member) && memberIsNotSelf(member)).filter((member) => currentObjectViewers.has(member.identity.identityKey)).map((member) => {
       const objectView = currentObjectViewers.get(member.identity.identityKey);
       const lastSeen = objectView?.lastSeen ?? -Infinity;
@@ -1180,7 +1128,7 @@ var SpacePresence = ({ object, spaceKey }) => {
         lastSeen
       };
     }).toSorted((a, b) => a.lastSeen - b.lastSeen);
-    return /* @__PURE__ */ React13.createElement(FullPresence, {
+    return /* @__PURE__ */ React12.createElement(FullPresence, {
       members: membersForObject
     });
   } finally {
@@ -1188,46 +1136,46 @@ var SpacePresence = ({ object, spaceKey }) => {
   }
 };
 var FullPresence = (props) => {
-  var _effect = _useSignals13();
+  var _effect = _useSignals12();
   try {
     const { size = 9, onMemberClick } = props;
     const members = useDefaultValue2(props.members, () => []);
     if (members.length === 0) {
       return null;
     }
-    return /* @__PURE__ */ React13.createElement("div", {
+    return /* @__PURE__ */ React12.createElement("div", {
       className: "dx-avatar-group",
       "data-testid": "spacePlugin.presence"
-    }, members.slice(0, 3).map((member, i) => /* @__PURE__ */ React13.createElement(Tooltip2.Trigger, {
+    }, members.slice(0, 3).map((member, i) => /* @__PURE__ */ React12.createElement(Tooltip.Trigger, {
       key: member.identity.identityKey.toHex(),
       side: "bottom",
       content: getName(member.identity),
       className: "grid focus:outline-none"
-    }, /* @__PURE__ */ React13.createElement(PresenceAvatar, {
+    }, /* @__PURE__ */ React12.createElement(PresenceAvatar, {
       identity: member.identity,
       match: member.currentlyAttended,
       index: members.length - i,
       onClick: () => onMemberClick?.(member),
       size
-    }))), members.length > 3 && /* @__PURE__ */ React13.createElement(Popover2.Root, null, /* @__PURE__ */ React13.createElement(Popover2.Trigger, {
+    }))), members.length > 3 && /* @__PURE__ */ React12.createElement(Popover2.Root, null, /* @__PURE__ */ React12.createElement(Popover2.Trigger, {
       className: "grid focus:outline-none"
-    }, /* @__PURE__ */ React13.createElement(Avatar.Root, null, /* @__PURE__ */ React13.createElement(Avatar.Content, {
+    }, /* @__PURE__ */ React12.createElement(Avatar.Root, null, /* @__PURE__ */ React12.createElement(Avatar.Content, {
       status: "inactive",
       style: {
         zIndex: members.length - 4
       },
       fallback: `+${members.length - 3}`,
       size
-    }))), /* @__PURE__ */ React13.createElement(Popover2.Portal, null, /* @__PURE__ */ React13.createElement(Popover2.Content, {
+    }))), /* @__PURE__ */ React12.createElement(Popover2.Portal, null, /* @__PURE__ */ React12.createElement(Popover2.Content, {
       side: "bottom"
-    }, /* @__PURE__ */ React13.createElement(Popover2.Arrow, null), /* @__PURE__ */ React13.createElement(Popover2.Viewport, {
+    }, /* @__PURE__ */ React12.createElement(Popover2.Arrow, null), /* @__PURE__ */ React12.createElement(Popover2.Viewport, {
       classNames: "max-bs-56"
-    }, /* @__PURE__ */ React13.createElement(List, null, members.map((member) => /* @__PURE__ */ React13.createElement(ListItem.Root, {
+    }, /* @__PURE__ */ React12.createElement(List, null, members.map((member) => /* @__PURE__ */ React12.createElement(ListItem.Root, {
       key: member.identity.identityKey.toHex(),
       classNames: "flex gap-2 items-center cursor-pointer mbe-2",
       onClick: () => onMemberClick?.(member),
       "data-testid": "identity-list-item"
-    }, /* @__PURE__ */ React13.createElement(PresenceAvatar, {
+    }, /* @__PURE__ */ React12.createElement(PresenceAvatar, {
       identity: member.identity,
       size,
       showName: true,
@@ -1237,12 +1185,12 @@ var FullPresence = (props) => {
     _effect.f();
   }
 };
-var PresenceAvatar = /* @__PURE__ */ forwardRef(({ identity, showName, match, index, onClick, size }, forwardedRef) => {
-  var _effect = _useSignals13();
+var PresenceAvatar = /* @__PURE__ */ forwardRef(({ identity, showName, match: match2, index, onClick, size }, forwardedRef) => {
+  var _effect = _useSignals12();
   try {
-    const status = match ? "current" : "active";
+    const status = match2 ? "current" : "active";
     const fallbackValue = keyToFallback(identity.identityKey);
-    return /* @__PURE__ */ React13.createElement(Avatar.Root, null, /* @__PURE__ */ React13.createElement(Avatar.Content, {
+    return /* @__PURE__ */ React12.createElement(Avatar.Root, null, /* @__PURE__ */ React12.createElement(Avatar.Content, {
       status,
       hue: identity.profile?.data?.hue || fallbackValue.hue,
       "data-testid": "spacePlugin.presence.member",
@@ -1256,7 +1204,7 @@ var PresenceAvatar = /* @__PURE__ */ forwardRef(({ identity, showName, match, in
       onClick,
       fallback: identity.profile?.data?.emoji || fallbackValue.emoji,
       ref: forwardedRef
-    }), /* @__PURE__ */ React13.createElement(Avatar.Label, {
+    }), /* @__PURE__ */ React12.createElement(Avatar.Label, {
       classNames: showName ? "text-sm truncate pli-2" : "sr-only"
     }, getName(identity)));
   } finally {
@@ -1264,7 +1212,7 @@ var PresenceAvatar = /* @__PURE__ */ forwardRef(({ identity, showName, match, in
   }
 });
 var SmallPresenceLive = ({ id, open, viewers }) => {
-  var _effect = _useSignals13();
+  var _effect = _useSignals12();
   try {
     const { hasAttention, isAncestor, isRelated } = useAttention(id);
     const isAttended = hasAttention || isAncestor || isRelated;
@@ -1277,8 +1225,8 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
       const moment = Date.now();
       return Array.from(viewers2.values()).filter((viewer) => moment - viewer.lastSeen < ACTIVITY_DURATION);
     };
-    const [activeViewers, setActiveViewers] = useState8(viewers ? getActiveViewers(viewers) : []);
-    useEffect4(() => {
+    const [activeViewers, setActiveViewers] = useState7(viewers ? getActiveViewers(viewers) : []);
+    useEffect3(() => {
       if (viewers) {
         setActiveViewers(getActiveViewers(viewers));
         const interval = setInterval(() => {
@@ -1289,7 +1237,7 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
     }, [
       viewers
     ]);
-    return /* @__PURE__ */ React13.createElement(SmallPresence, {
+    return /* @__PURE__ */ React12.createElement(SmallPresence, {
       count: activeViewers.length,
       attended: isAttended,
       containsAttended
@@ -1299,16 +1247,16 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
   }
 };
 var SmallPresence = ({ count = 0, attended, containsAttended }) => {
-  var _effect = _useSignals13();
+  var _effect = _useSignals12();
   try {
-    const { t } = useTranslation13(meta.id);
-    return /* @__PURE__ */ React13.createElement(Tooltip2.Trigger, {
+    const { t } = useTranslation12(meta.id);
+    return /* @__PURE__ */ React12.createElement(Tooltip.Trigger, {
       asChild: true,
       content: t("presence label", {
         count
       }),
       side: "bottom"
-    }, /* @__PURE__ */ React13.createElement(AttentionGlyph, {
+    }, /* @__PURE__ */ React12.createElement(AttentionGlyph, {
       attended,
       containsAttended,
       presence: count > 1 ? "many" : count === 1 ? "one" : "none",
@@ -1320,43 +1268,44 @@ var SmallPresence = ({ count = 0, attended, containsAttended }) => {
 };
 
 // src/components/SpacePluginSettings.tsx
-import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
-import React14 from "react";
-import { createIntent as createIntent8, useIntentDispatcher as useIntentDispatcher8 } from "@dxos/app-framework";
+import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
+import React13 from "react";
+import { createIntent as createIntent8 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher8 } from "@dxos/app-framework/react";
 import { useClient as useClient6 } from "@dxos/react-client";
 import { useSpaces as useSpaces2 } from "@dxos/react-client/echo";
-import { IconButton, Input as Input4, List as List2, ListItem as ListItem2, toLocalizedString as toLocalizedString3, useTranslation as useTranslation14 } from "@dxos/react-ui";
+import { IconButton as IconButton3, Input as Input4, List as List2, ListItem as ListItem2, toLocalizedString as toLocalizedString3, useTranslation as useTranslation13 } from "@dxos/react-ui";
 import { ControlGroup, ControlItemInput as ControlItemInput2, ControlPage as ControlPage3, ControlSection as ControlSection3, controlItemClasses as controlItemClasses2 } from "@dxos/react-ui-form";
 var SpacePluginSettings = ({ settings }) => {
-  var _effect = _useSignals14();
+  var _effect = _useSignals13();
   try {
-    const { t } = useTranslation14(meta.id);
+    const { t } = useTranslation13(meta.id);
     const client = useClient6();
     const spaces = useSpaces2({
       all: settings.showHidden
     });
     const { dispatchPromise: dispatch } = useIntentDispatcher8();
-    return /* @__PURE__ */ React14.createElement(ControlPage3, null, /* @__PURE__ */ React14.createElement(ControlSection3, {
+    return /* @__PURE__ */ React13.createElement(ControlPage3, null, /* @__PURE__ */ React13.createElement(ControlSection3, {
       title: t("space settings label"),
       description: t("space settings description")
-    }, /* @__PURE__ */ React14.createElement(ControlGroup, null, /* @__PURE__ */ React14.createElement(ControlItemInput2, {
+    }, /* @__PURE__ */ React13.createElement(ControlGroup, null, /* @__PURE__ */ React13.createElement(ControlItemInput2, {
       title: t("show hidden spaces label")
-    }, /* @__PURE__ */ React14.createElement(Input4.Switch, {
+    }, /* @__PURE__ */ React13.createElement(Input4.Switch, {
       checked: settings.showHidden,
       onCheckedChange: (checked) => settings.showHidden = !!checked
-    }))), /* @__PURE__ */ React14.createElement(List2, {
+    }))), /* @__PURE__ */ React13.createElement(List2, {
       classNames: [
         controlItemClasses2,
         "flex flex-col gap-trimSm"
       ]
-    }, spaces.map((space) => /* @__PURE__ */ React14.createElement(ListItem2.Root, {
+    }, spaces.map((space) => /* @__PURE__ */ React13.createElement(ListItem2.Root, {
       key: space.id,
       classNames: "is-full items-center"
-    }, /* @__PURE__ */ React14.createElement(ListItem2.Heading, {
+    }, /* @__PURE__ */ React13.createElement(ListItem2.Heading, {
       classNames: "grow truncate !min-bs-0"
     }, toLocalizedString3(getSpaceDisplayName(space, {
       personal: space === client.spaces.default
-    }), t)), /* @__PURE__ */ React14.createElement(IconButton, {
+    }), t)), /* @__PURE__ */ React13.createElement(IconButton3, {
       icon: "ph--faders--regular",
       onClick: () => dispatch(createIntent8(SpaceAction.OpenSettings, {
         space
@@ -1369,39 +1318,40 @@ var SpacePluginSettings = ({ settings }) => {
 };
 
 // src/components/SpaceSettings/SpaceSettingsContainer.tsx
-import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import * as Function2 from "effect/Function";
+import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
+import * as Function3 from "effect/Function";
 import * as Schema from "effect/Schema";
-import React15, { useCallback as useCallback10, useMemo as useMemo2, useState as useState9 } from "react";
-import { LayoutAction as LayoutAction7, chain as chain2, createIntent as createIntent9, useIntentDispatcher as useIntentDispatcher9 } from "@dxos/app-framework";
+import React14, { useCallback as useCallback10, useMemo as useMemo2, useState as useState8 } from "react";
+import { LayoutAction as LayoutAction7, chain as chain2, createIntent as createIntent9 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher9 } from "@dxos/app-framework/react";
 import { log as log3 } from "@dxos/log";
 import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { useClient as useClient7 } from "@dxos/react-client";
 import { SpaceState } from "@dxos/react-client/echo";
-import { Button as Button7, Input as Input5, useMulticastObservable, useTranslation as useTranslation15 } from "@dxos/react-ui";
+import { Button as Button5, Input as Input5, useFileDownload, useMulticastObservable, useTranslation as useTranslation14 } from "@dxos/react-ui";
 import { ControlItem, ControlItemInput as ControlItemInput3, ControlPage as ControlPage4, ControlSection as ControlSection4, Form as Form3 } from "@dxos/react-ui-form";
 import { HuePicker, IconPicker } from "@dxos/react-ui-pickers";
 import { StackItem as StackItem3 } from "@dxos/react-ui-stack";
 var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/SpaceSettings/SpaceSettingsContainer.tsx";
 var FormSchema = SpaceForm.pipe(Schema.extend(Schema.Struct({
   archived: Schema.Boolean.annotations({
-    title: "Archive space"
+    title: "Archive Space"
   })
 })));
 var SpaceSettingsContainer = ({ space }) => {
-  var _effect = _useSignals15();
+  var _effect = _useSignals14();
   try {
-    const { t } = useTranslation15(meta.id);
+    const { t } = useTranslation14(meta.id);
     const { dispatchPromise: dispatch } = useIntentDispatcher9();
     const client = useClient7();
     const archived = useMulticastObservable(space.state) === SpaceState.SPACE_INACTIVE;
-    const [edgeReplication, setEdgeReplication] = useState9(space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED);
+    const [edgeReplication, setEdgeReplication] = useState8(space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED);
     const toggleEdgeReplication = useCallback10(async (next) => {
       setEdgeReplication(next);
       await space?.internal.setEdgeReplicationPreference(next ? EdgeReplicationSetting.ENABLED : EdgeReplicationSetting.DISABLED).catch((err) => {
         log3.catch(err, void 0, {
           F: __dxlog_file4,
-          L: 52,
+          L: 57,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1422,7 +1372,7 @@ var SpaceSettingsContainer = ({ space }) => {
         space.properties.hue = properties.hue;
       }
       if (properties.archived && !archived) {
-        void dispatch(Function2.pipe(createIntent9(SpaceAction.Close, {
+        void dispatch(Function3.pipe(createIntent9(SpaceAction.Close, {
           space
         }), chain2(LayoutAction7.SwitchWorkspace, {
           part: "workspace",
@@ -1453,14 +1403,14 @@ var SpaceSettingsContainer = ({ space }) => {
     ]);
     const customElements = useMemo2(() => ({
       name: ({ type, label, getValue, onValueChange }) => {
-        const handleChange = useCallback10(({ target: { value } }) => onValueChange(type, value), [
+        const handleChange = useCallback10(({ target: { value: value2 } }) => onValueChange(type, value2), [
           onValueChange,
           type
         ]);
-        return /* @__PURE__ */ React15.createElement(ControlItemInput3, {
+        return /* @__PURE__ */ React14.createElement(ControlItemInput3, {
           title: label,
           description: t("display name description")
-        }, /* @__PURE__ */ React15.createElement(Input5.TextInput, {
+        }, /* @__PURE__ */ React14.createElement(Input5.TextInput, {
           value: getValue(),
           onChange: handleChange,
           placeholder: t("display name input placeholder"),
@@ -1476,15 +1426,14 @@ var SpaceSettingsContainer = ({ space }) => {
           onValueChange,
           type
         ]);
-        return /* @__PURE__ */ React15.createElement(ControlItem, {
+        return /* @__PURE__ */ React14.createElement(ControlItem, {
           title: label,
           description: t("icon description")
-        }, /* @__PURE__ */ React15.createElement(IconPicker, {
+        }, /* @__PURE__ */ React14.createElement(IconPicker, {
           value: getValue(),
           onChange: handleChange,
           onReset: handleReset,
-          classNames: "justify-self-end",
-          iconSize: 5
+          classNames: "justify-self-end"
         }));
       },
       hue: ({ type, label, getValue, onValueChange }) => {
@@ -1496,14 +1445,14 @@ var SpaceSettingsContainer = ({ space }) => {
           onValueChange,
           type
         ]);
-        return /* @__PURE__ */ React15.createElement(ControlItem, {
+        return /* @__PURE__ */ React14.createElement(ControlItem, {
           title: label,
           description: t("hue description")
-        }, /* @__PURE__ */ React15.createElement(HuePicker, {
+        }, /* @__PURE__ */ React14.createElement(HuePicker, {
           value: getValue(),
           onChange: handleChange,
           onReset: handleReset,
-          classNames: "[--hue-preview-size:1.25rem] justify-self-end"
+          classNames: "justify-self-end"
         }));
       },
       edgeReplication: ({ type, label, getValue, onValueChange }) => {
@@ -1511,10 +1460,10 @@ var SpaceSettingsContainer = ({ space }) => {
           onValueChange,
           type
         ]);
-        return /* @__PURE__ */ React15.createElement(ControlItemInput3, {
+        return /* @__PURE__ */ React14.createElement(ControlItemInput3, {
           title: label,
           description: t("edge replication description")
-        }, /* @__PURE__ */ React15.createElement(Input5.Switch, {
+        }, /* @__PURE__ */ React14.createElement(Input5.Switch, {
           checked: getValue(),
           onCheckedChange: handleChange,
           classNames: "justify-self-end"
@@ -1526,11 +1475,12 @@ var SpaceSettingsContainer = ({ space }) => {
           type,
           getValue
         ]);
-        return /* @__PURE__ */ React15.createElement(ControlItemInput3, {
+        return /* @__PURE__ */ React14.createElement(ControlItemInput3, {
           title: label,
           description: t("archive space description")
-        }, /* @__PURE__ */ React15.createElement(Button7, {
+        }, /* @__PURE__ */ React14.createElement(Button5, {
           disabled: space === client.spaces.default,
+          variant: getValue() ? "default" : "destructive",
           onClick: handleChange
         }, getValue() ? t("unarchive space label") : t("archive space label")));
       }
@@ -1538,16 +1488,26 @@ var SpaceSettingsContainer = ({ space }) => {
       t,
       space
     ]);
-    return /* @__PURE__ */ React15.createElement(StackItem3.Content, {
+    const download = useFileDownload();
+    const handleBackup = useCallback10(async () => {
+      const archive = await space.internal.export();
+      download(new Blob([
+        archive.contents
+      ]), archive.filename);
+    }, [
+      space,
+      download
+    ]);
+    return /* @__PURE__ */ React14.createElement(StackItem3.Content, {
       scrollable: true
-    }, /* @__PURE__ */ React15.createElement(ControlPage4, null, /* @__PURE__ */ React15.createElement(ControlSection4, {
+    }, /* @__PURE__ */ React14.createElement(ControlPage4, null, /* @__PURE__ */ React14.createElement(ControlSection4, {
       title: t("space properties settings verbose label", {
         ns: meta.id
       }),
       description: t("space properties settings description", {
         ns: meta.id
       })
-    }, /* @__PURE__ */ React15.createElement(Form3, {
+    }, /* @__PURE__ */ React14.createElement(Form3, {
       schema: FormSchema,
       values,
       autoSave: true,
@@ -1555,27 +1515,36 @@ var SpaceSettingsContainer = ({ space }) => {
       Custom: customElements,
       outerSpacing: false,
       classNames: "container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]"
-    }))));
+    })), /* @__PURE__ */ React14.createElement(ControlItemInput3, {
+      title: t("backup space label", {
+        ns: meta.id
+      }),
+      description: t("backup space description", {
+        ns: meta.id
+      })
+    }, /* @__PURE__ */ React14.createElement(Button5, {
+      onClick: handleBackup
+    }, t("download backup")))));
   } finally {
     _effect.f();
   }
 };
 
 // src/components/SyncStatus/InlineSyncStatus.tsx
-import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
+import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
 import * as Option3 from "effect/Option";
-import React16, { useEffect as useEffect5, useState as useState10 } from "react";
-import { useAppGraph as useAppGraph3 } from "@dxos/app-framework";
+import React15, { useEffect as useEffect4, useState as useState9 } from "react";
+import { useAppGraph as useAppGraph3 } from "@dxos/app-framework/react";
 import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { useClient as useClient8 } from "@dxos/react-client";
 import { useSpaceSyncState } from "@dxos/react-client/echo";
-import { Tooltip as Tooltip3, useTranslation as useTranslation16 } from "@dxos/react-ui";
+import { Tooltip as Tooltip2, useTranslation as useTranslation15 } from "@dxos/react-ui";
 import { AttentionGlyph as AttentionGlyph2, useAttended as useAttended2, useAttention as useAttention2 } from "@dxos/react-ui-attention";
 var useEdgeStatus = () => {
-  const [status, setStatus] = useState10(EdgeStatus.ConnectionState.NOT_CONNECTED);
+  const [status, setStatus] = useState9(EdgeStatus.ConnectionState.NOT_CONNECTED);
   const client = useClient8();
-  useEffect5(() => {
+  useEffect4(() => {
     client.services.services.EdgeAgentService?.queryEdgeStatus().subscribe(({ status: status2 }) => {
       setStatus(status2.state);
     });
@@ -1585,9 +1554,9 @@ var useEdgeStatus = () => {
   return status;
 };
 var InlineSyncStatus = ({ space, open }) => {
-  var _effect = _useSignals16();
+  var _effect = _useSignals15();
   try {
-    const { t } = useTranslation16(meta.id);
+    const { t } = useTranslation15(meta.id);
     const id = space.id;
     const { hasAttention, isAncestor, isRelated } = useAttention2(id);
     const isAttended = hasAttention || isAncestor || isRelated;
@@ -1600,11 +1569,11 @@ var InlineSyncStatus = ({ space, open }) => {
     const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting2.ENABLED;
     const syncState = useSpaceSyncState(space);
     const syncing = connectedToEdge && edgeSyncEnabled && syncState && syncState.missingOnLocal > 0;
-    return /* @__PURE__ */ React16.createElement(Tooltip3.Trigger, {
+    return /* @__PURE__ */ React15.createElement(Tooltip2.Trigger, {
       asChild: true,
       content: t("syncing label"),
       side: "bottom"
-    }, /* @__PURE__ */ React16.createElement(AttentionGlyph2, {
+    }, /* @__PURE__ */ React15.createElement(AttentionGlyph2, {
       syncing,
       attended: isAttended,
       containsAttended,
@@ -1616,14 +1585,15 @@ var InlineSyncStatus = ({ space, open }) => {
 };
 
 // src/components/SyncStatus/SyncStatus.tsx
-import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
-import React17, { useEffect as useEffect6, useState as useState11 } from "react";
+import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
+import React16, { useEffect as useEffect5, useState as useState10 } from "react";
 import { StatusBar } from "@dxos/plugin-status-bar";
 import { EdgeStatus as EdgeStatus2 } from "@dxos/protocols/proto/dxos/client/services";
 import { useClient as useClient9 } from "@dxos/react-client";
 import { useStream } from "@dxos/react-client/devtools";
 import { getSyncSummary, useSyncState } from "@dxos/react-client/echo";
-import { Icon as Icon8, Popover as Popover3, useTranslation as useTranslation17 } from "@dxos/react-ui";
+import { Icon as Icon5, Popover as Popover3, useTranslation as useTranslation16 } from "@dxos/react-ui";
+import { mx } from "@dxos/react-ui-theme";
 import { Unit } from "@dxos/util";
 
 // src/components/SyncStatus/save-tracker.ts
@@ -1720,17 +1690,13 @@ var getIcon = (status) => {
 // src/components/SyncStatus/SyncStatus.tsx
 var SYNC_STALLED_TIMEOUT = 5e3;
 var SyncStatus = () => {
-  var _effect = _useSignals17();
+  var _effect = _useSignals16();
   try {
     const client = useClient9();
     const state = useSyncState();
-    const [saved, setSaved] = useState11(true);
-    useEffect6(() => {
-      return createClientSaveTracker(client, (state2) => {
-        setSaved(state2 === "saved");
-      });
-    }, []);
-    return /* @__PURE__ */ React17.createElement(SyncStatusIndicator, {
+    const [saved, setSaved] = useState10(true);
+    useEffect5(() => createClientSaveTracker(client, (state2) => setSaved(state2 === "saved")), []);
+    return /* @__PURE__ */ React16.createElement(SyncStatusIndicator, {
       state,
       saved
     });
@@ -1739,9 +1705,9 @@ var SyncStatus = () => {
   }
 };
 var SyncStatusIndicator = ({ state, saved }) => {
-  var _effect = _useSignals17();
+  var _effect = _useSignals16();
   try {
-    const { t } = useTranslation17(meta.id);
+    const { t } = useTranslation16(meta.id);
     const summary = getSyncSummary(state);
     const offline = Object.values(state).length === 0;
     const needsToUpload = summary.differentDocuments > 0 || summary.missingOnRemote > 0;
@@ -1752,8 +1718,8 @@ var SyncStatusIndicator = ({ state, saved }) => {
       needsToUpload,
       needsToDownload
     });
-    const [classNames, setClassNames] = useState11();
-    useEffect6(() => {
+    const [classNames, setClassNames] = useState10();
+    useEffect5(() => {
       setClassNames(void 0);
       if (offline || !needsToUpload && !needsToDownload) {
         return;
@@ -1768,16 +1734,15 @@ var SyncStatusIndicator = ({ state, saved }) => {
       needsToDownload
     ]);
     const title = t(`${status} label`);
-    const icon = /* @__PURE__ */ React17.createElement(Icon8, {
+    const icon = /* @__PURE__ */ React16.createElement(Icon5, {
       icon: getIcon(status),
-      size: 4,
       classNames
     });
-    return /* @__PURE__ */ React17.createElement(Popover3.Root, null, /* @__PURE__ */ React17.createElement(Popover3.Trigger, {
+    return /* @__PURE__ */ React16.createElement(Popover3.Root, null, /* @__PURE__ */ React16.createElement(Popover3.Trigger, {
       asChild: true
-    }, /* @__PURE__ */ React17.createElement(StatusBar.Item, {
+    }, /* @__PURE__ */ React16.createElement(StatusBar.Item, {
       title
-    }, icon)), /* @__PURE__ */ React17.createElement(Popover3.Portal, null, /* @__PURE__ */ React17.createElement(Popover3.Content, null, /* @__PURE__ */ React17.createElement(EdgeConnectionPopover, null), /* @__PURE__ */ React17.createElement(Popover3.Arrow, null))));
+    }, icon)), /* @__PURE__ */ React16.createElement(Popover3.Portal, null, /* @__PURE__ */ React16.createElement(Popover3.Content, null, /* @__PURE__ */ React16.createElement(EdgeConnectionPopover, null), /* @__PURE__ */ React16.createElement(Popover3.Arrow, null))));
   } finally {
     _effect.f();
   }
@@ -1788,99 +1753,235 @@ var useEdgeStatus2 = () => {
   return status;
 };
 var EdgeConnectionPopover = () => {
-  var _effect = _useSignals17();
+  var _effect = _useSignals16();
   try {
     const status = useEdgeStatus2();
-    const { t } = useTranslation17(meta.id);
+    const { t } = useTranslation16(meta.id);
     const isConnected = status?.state === EdgeStatus2.ConnectionState.CONNECTED;
-    return /* @__PURE__ */ React17.createElement("div", {
-      className: "p-3 min-w-[240px]"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center gap-2 mb-3 pb-2 border-b border-neutral-100 dark:border-neutral-800"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: `w-2 h-2 rounded-full ${isConnected ? "bg-success-500 animate-pulse" : "bg-error-500"}`
-    }), /* @__PURE__ */ React17.createElement("span", {
-      className: "font-medium text-sm text-neutral-900 dark:text-neutral-100"
-    }, isConnected ? t("Edge connected") : t("Edge disconnected"))), status?.state === EdgeStatus2.ConnectionState.NOT_CONNECTED && /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center gap-2 text-sm text-neutral-600 dark:text-neutral-400"
-    }, /* @__PURE__ */ React17.createElement(Icon8, {
-      icon: "ph--cloud-x--regular",
-      size: 4
-    }), /* @__PURE__ */ React17.createElement("span", null, t("No connection to edge service"))), status?.state === EdgeStatus2.ConnectionState.CONNECTED && /* @__PURE__ */ React17.createElement("div", {
+    return /* @__PURE__ */ React16.createElement("div", {
+      className: "min-is-[240px] p-2"
+    }, /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center gap-2 mbe-2"
+    }, /* @__PURE__ */ React16.createElement(Icon5, {
+      icon: isConnected ? "ph--check-circle--regular" : "ph--warning-circle--regular",
+      classNames: mx(isConnected ? "text-successText" : "text-errorText animate-pulse")
+    }), /* @__PURE__ */ React16.createElement("span", {
+      className: "font-medium text-sm"
+    }, isConnected ? t("sync edge connected label") : t("sync edge disconnected label"))), status?.state === EdgeStatus2.ConnectionState.NOT_CONNECTED && /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center gap-2 text-sm text-description"
+    }, /* @__PURE__ */ React16.createElement(Icon5, {
+      icon: "ph--cloud-x--regular"
+    }), /* @__PURE__ */ React16.createElement("span", null, t("sync no connection label"))), status?.state === EdgeStatus2.ConnectionState.CONNECTED && /* @__PURE__ */ React16.createElement("div", {
       className: "space-y-2"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center justify-between"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center gap-2 text-sm text-neutral-600 dark:text-neutral-400"
-    }, /* @__PURE__ */ React17.createElement(Icon8, {
-      icon: "ph--timer--regular",
-      size: 4
-    }), /* @__PURE__ */ React17.createElement("span", null, t("Latency"))), /* @__PURE__ */ React17.createElement("span", {
-      className: "text-sm font-mono text-neutral-900 dark:text-neutral-100"
-    }, status.rtt.toFixed(0), " ms")), /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center justify-between"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center gap-2 text-sm text-neutral-600 dark:text-neutral-400"
-    }, /* @__PURE__ */ React17.createElement(Icon8, {
-      icon: "ph--arrow-up--regular",
-      size: 4
-    }), /* @__PURE__ */ React17.createElement("span", null, t("Upload"))), /* @__PURE__ */ React17.createElement("span", {
-      className: "text-sm font-mono text-neutral-900 dark:text-neutral-100"
-    }, Unit.Kilobyte(status.rateBytesUp, 0), "/s")), /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center justify-between"
-    }, /* @__PURE__ */ React17.createElement("div", {
-      className: "flex items-center gap-2 text-sm text-neutral-600 dark:text-neutral-400"
-    }, /* @__PURE__ */ React17.createElement(Icon8, {
-      icon: "ph--arrow-down--regular",
-      size: 4
-    }), /* @__PURE__ */ React17.createElement("span", null, t("Download"))), /* @__PURE__ */ React17.createElement("span", {
-      className: "text-sm font-mono text-neutral-900 dark:text-neutral-100"
-    }, Unit.Kilobyte(status.rateBytesDown, 0), "/s"))));
+    }, /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center justify-between text-sm"
+    }, /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center gap-2 text-description"
+    }, /* @__PURE__ */ React16.createElement(Icon5, {
+      icon: "ph--timer--regular"
+    }), /* @__PURE__ */ React16.createElement("span", null, t("sync latency label"))), /* @__PURE__ */ React16.createElement(UnitValue, {
+      value: status.rtt,
+      format: Unit.Millisecond
+    })), /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center justify-between text-sm"
+    }, /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center gap-2 text-description"
+    }, /* @__PURE__ */ React16.createElement(Icon5, {
+      icon: "ph--arrow-up--regular"
+    }), /* @__PURE__ */ React16.createElement("span", null, t("sync upload label"))), /* @__PURE__ */ React16.createElement(UnitValue, {
+      value: status.rateBytesUp,
+      format: Unit.Kilobyte,
+      suffix: "/s"
+    })), /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center justify-between text-sm"
+    }, /* @__PURE__ */ React16.createElement("div", {
+      className: "flex items-center gap-2 text-sm text-description"
+    }, /* @__PURE__ */ React16.createElement(Icon5, {
+      icon: "ph--arrow-down--regular"
+    }), /* @__PURE__ */ React16.createElement("span", null, t("sync download label"))), /* @__PURE__ */ React16.createElement(UnitValue, {
+      value: status.rateBytesDown,
+      format: Unit.Kilobyte,
+      suffix: "/s"
+    }))));
   } finally {
     _effect.f();
   }
 };
+var UnitValue = ({ value: input, format, suffix }) => {
+  var _effect = _useSignals16();
+  try {
+    const { formattedValue, unit } = format(input);
+    return /* @__PURE__ */ React16.createElement("span", {
+      className: "font-mono"
+    }, formattedValue, /* @__PURE__ */ React16.createElement("span", {
+      className: "mis-1 text-subdued"
+    }, unit.symbol, suffix));
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/helpers/query.ts
+import * as Array2 from "effect/Array";
+import * as Effect3 from "effect/Effect";
+import * as EffectFunction from "effect/Function";
+import * as Match from "effect/Match";
+import * as Option4 from "effect/Option";
+import * as SchemaAST from "effect/SchemaAST";
+import { DXN, Filter as Filter2, Query as Query2 } from "@dxos/echo";
+import { ReferenceAnnotationId, getTypeAnnotation as getTypeAnnotation2, unwrapOptional } from "@dxos/echo/internal";
+import { log as log4 } from "@dxos/log";
+import { Person } from "@dxos/types";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/helpers/query.ts";
+var evalQuery = (queryString) => {
+  const globals = {
+    Query: Query2,
+    Filter: Filter2,
+    Person
+  };
+  try {
+    return new Function(...Object.keys(globals), `return ${queryString}`)(...Object.values(globals));
+  } catch (err) {
+    log4.catch(err, void 0, {
+      F: __dxlog_file6,
+      L: 33,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    return Query2.select(Filter2.nothing());
+  }
+};
+var resolveSchemaWithClientAndSpace = (client, space, query) => {
+  const resolve = Effect3.fn(function* (dxn) {
+    const typename = DXN.parse(dxn).asTypeDXN()?.type;
+    if (!typename) {
+      return Option4.none();
+    }
+    const staticSchema = client.graph.schemaRegistry.getSchema(typename);
+    if (staticSchema) {
+      return Option4.some(staticSchema);
+    }
+    const query2 = space.db.schemaRegistry.query({
+      typename
+    });
+    const schemas = yield* Effect3.promise(() => query2.run());
+    return Array2.head(schemas).pipe(Option4.map((schema) => schema.snapshot));
+  });
+  return resolveSchema(query, resolve).pipe(Effect3.map((schema) => Option4.getOrUndefined(schema)), Effect3.runPromise);
+};
+var resolveSchema = (query, resolve) => {
+  return Match.value(query).pipe(
+    Match.withReturnType(),
+    // TODO(wittjosiah): Reconcile with filter match?
+    Match.when({
+      type: "select"
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option4.map((typename) => resolve(typename)), Option4.getOrElse(() => Effect3.succeed(Option4.none())))),
+    Match.when({
+      type: "filter"
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option4.map((typename) => resolve(typename)), Option4.getOrElse(() => Effect3.succeed(Option4.none())))),
+    Match.when({
+      type: "reference-traversal"
+    }, ({ anchor, property }) => resolveSchema(anchor, resolve).pipe(Effect3.map((base) => base.pipe(Option4.map((schema) => SchemaAST.getPropertySignatures(schema.ast)), Option4.flatMap((properties) => Array2.findFirst(properties, (p) => p.name === property)), Option4.flatMap((property2) => SchemaAST.getAnnotation(ReferenceAnnotationId)(unwrapOptional(property2))), Option4.map((annotation) => annotation.typename))), Effect3.flatMap(Option4.match({
+      onNone: () => Effect3.succeed(Option4.none()),
+      onSome: (typename) => resolve(DXN.fromTypename(typename).toString())
+    })))),
+    Match.when({
+      type: "relation",
+      filter: Match.defined
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option4.map((typename) => resolve(typename)), Option4.getOrElse(() => Effect3.succeed(Option4.none())))),
+    Match.when({
+      type: "relation-traversal"
+    }, ({ anchor, direction }) => resolveSchema(anchor, resolve).pipe(Effect3.map((base) => base.pipe(Option4.map((schema) => getTypeAnnotation2(schema)), Option4.flatMap((annotation) => Option4.fromNullable(direction === "source" ? annotation?.sourceSchema : annotation?.targetSchema)))), Effect3.flatMap(Option4.match({
+      onNone: () => Effect3.succeed(Option4.none()),
+      onSome: (typename) => resolve(typename)
+    })))),
+    Match.when({
+      type: "options"
+    }, ({ query: query2 }) => resolveSchema(query2, resolve)),
+    Match.orElse((_q) => {
+      return Effect3.succeed(Option4.none());
+    })
+  );
+};
+var typenameFromFilter = (filter) => Match.value(filter).pipe(Match.withReturnType(), Match.when({
+  type: "object"
+}, ({ typename }) => Option4.fromNullable(typename)), Match.when({
+  type: "and"
+}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option4.isSome), Option4.flatten)), Match.when({
+  type: "or"
+}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option4.isSome), Option4.flatten)), Match.orElse(() => Option4.none()));
+var getQueryTarget = (query, space) => {
+  return Match.value(query).pipe(Match.when({
+    type: "options"
+  }, ({ options }) => {
+    return Option4.fromNullable(options.queues).pipe(Option4.flatMap((queues) => Array2.head(queues)), Option4.flatMap((queueDxn) => Option4.fromNullable(DXN.tryParse(queueDxn))), Option4.flatMap((queueDxn) => Option4.fromNullable(space?.queues.get(queueDxn))), Option4.getOrElse(() => space));
+  }), Match.orElse(() => space));
+};
 
 // src/components/ViewEditor.tsx
-import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
-import React18, { useCallback as useCallback11 } from "react";
-import { createIntent as createIntent10, useIntentDispatcher as useIntentDispatcher10 } from "@dxos/app-framework";
-import { Type as Type3 } from "@dxos/echo";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
+import * as Schema2 from "effect/Schema";
+import React17, { useCallback as useCallback11, useState as useState11 } from "react";
+import { createIntent as createIntent10 } from "@dxos/app-framework";
+import { useIntentDispatcher as useIntentDispatcher10 } from "@dxos/app-framework/react";
+import { DXN as DXN2, Filter as Filter3, Obj as Obj6, Query as Query3, Tag, Type as Type3 } from "@dxos/echo";
 import { useClient as useClient10 } from "@dxos/react-client";
-import { getSpace as getSpace4, useSchema } from "@dxos/react-client/echo";
+import { getSpace as getSpace4, useQuery as useQuery3 } from "@dxos/react-client/echo";
+import { useAsyncEffect } from "@dxos/react-ui";
 import { ViewEditor as NaturalViewEditor } from "@dxos/react-ui-form";
-import { getTypenameFromQuery as getTypenameFromQuery2 } from "@dxos/schema";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/plugins/plugin-space/src/components/ViewEditor.tsx";
+import { View } from "@dxos/schema";
 var ViewEditor = ({ view }) => {
-  var _effect = _useSignals18();
+  var _effect = _useSignals17();
   try {
     const { dispatchPromise: dispatch } = useIntentDispatcher10();
     const client = useClient10();
     const space = getSpace4(view);
-    const typename = view.query ? getTypenameFromQuery2(view.query.ast) : void 0;
-    const schema = useSchema(client, space, typename);
-    const handleUpdateQuery = useCallback11((newQuery) => {
-      invariant2(schema, void 0, {
-        F: __dxlog_file6,
-        L: 28,
-        S: void 0,
-        A: [
-          "schema",
-          ""
-        ]
-      });
-      invariant2(Type3.isMutable(schema), void 0, {
-        F: __dxlog_file6,
-        L: 29,
-        S: void 0,
-        A: [
-          "Type.isMutable(schema)",
-          ""
+    const [schema, setSchema] = useState11(() => Schema2.Struct({}));
+    const tags = useQuery3(space, Filter3.type(Tag.Tag));
+    const types = useTypeOptions({
+      space,
+      annotation: [
+        "dynamic",
+        "limited-static",
+        "object-form"
+      ]
+    });
+    useAsyncEffect(async () => {
+      if (!view?.query || !space) {
+        return;
+      }
+      const foundSchema = await resolveSchemaWithClientAndSpace(client, space, view.query.ast);
+      if (foundSchema && foundSchema !== schema) {
+        setSchema(() => foundSchema);
+      }
+    }, [
+      client,
+      space,
+      view,
+      schema
+    ]);
+    const handleQueryChanged = useCallback11(async (newQuery, target) => {
+      if (!view || !space) {
+        return;
+      }
+      const queue = target && DXN2.tryParse(target) ? target : void 0;
+      const query = queue ? Query3.fromAst(newQuery).options({
+        queues: [
+          queue
         ]
+      }) : Query3.fromAst(newQuery);
+      view.query.ast = query.ast;
+      const newSchema = await resolveSchemaWithClientAndSpace(client, space, query.ast);
+      if (!newSchema) {
+        return;
+      }
+      const newView = View.make({
+        query,
+        jsonSchema: Type3.toJsonSchema(newSchema),
+        presentation: Obj6.make(Type3.Expando, {})
       });
-      view.query.ast = newQuery;
-      schema.updateTypename(getTypenameFromQuery2(newQuery));
+      view.projection = Obj6.getSnapshot(newView).projection;
+      setSchema(() => newSchema);
     }, [
       view,
       schema
@@ -1897,13 +1998,16 @@ var ViewEditor = ({ view }) => {
     if (!space || !schema) {
       return null;
     }
-    return /* @__PURE__ */ React18.createElement(NaturalViewEditor, {
+    return /* @__PURE__ */ React17.createElement(NaturalViewEditor, {
       registry: space.db.schemaRegistry,
       schema,
       view,
-      onQueryChanged: Type3.isMutable(schema) ? handleUpdateQuery : void 0,
-      onDelete: Type3.isMutable(schema) ? handleDelete : void 0,
-      outerSpacing: false
+      mode: "query",
+      outerSpacing: false,
+      tags,
+      types,
+      onQueryChanged: handleQueryChanged,
+      onDelete: Type3.isMutable(schema) ? handleDelete : void 0
     });
   } finally {
     _effect.f();
@@ -1912,10 +2016,10 @@ var ViewEditor = ({ view }) => {
 
 // src/components/index.ts
 import { lazy } from "react";
-var CollectionMain = lazy(() => import("./CollectionMain-EU57SRYK.mjs"));
-var ObjectDetailsPanel = lazy(() => import("./ObjectDetailsPanel-NABA2S56.mjs"));
-var ObjectSettingsContainer = lazy(() => import("./ObjectSettings-GXGTITF5.mjs"));
-var RecordMain = lazy(() => import("./RecordMain-MYFTAQ2U.mjs"));
+var CollectionArticle = lazy(() => import("./CollectionArticle-G3V4QXPI.mjs"));
+var ObjectDetailsPanel = lazy(() => import("./ObjectDetailsPanel-6PZQIQG3.mjs"));
+var ObjectSettingsContainer = lazy(() => import("./ObjectSettings-OQSBOH7K.mjs"));
+var RecordArticle = lazy(() => import("./RecordArticle-PBMLYY5K.mjs"));
 
 export {
   AwaitingObject,
@@ -1928,13 +2032,12 @@ export {
   JoinDialog,
   MembersContainer,
   MenuFooter,
-  PersistenceStatus,
-  POPOVER_RENAME_OBJECT,
-  PopoverRenameObject,
-  POPOVER_RENAME_SPACE,
-  PopoverRenameSpace,
-  useQuerySpaceSchemas,
+  OBJECT_RENAME_POPOVER,
+  ObjectRenamePopover,
+  SPACE_RENAME_POPOVER,
+  SpaceRenamePopover,
   SchemaContainer,
+  useQuerySpaceSchemas,
   SpacePresence,
   FullPresence,
   SmallPresenceLive,
@@ -1944,10 +2047,13 @@ export {
   InlineSyncStatus,
   SyncStatus,
   SyncStatusIndicator,
+  evalQuery,
+  resolveSchemaWithClientAndSpace,
+  getQueryTarget,
   ViewEditor,
-  CollectionMain,
+  CollectionArticle,
   ObjectDetailsPanel,
   ObjectSettingsContainer,
-  RecordMain
+  RecordArticle
 };
-//# sourceMappingURL=chunk-DG5YEEPZ.mjs.map
+//# sourceMappingURL=chunk-MI4A5XUX.mjs.map