@dxos/plugin-space 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/dist/lib/node-esm/{chunk-ITQFSFQ3.mjs → chunk-JAMGJUFU.mjs}

@@ -3,18 +3,18 @@ import {
   useInputSurfaceLookup,
   usePath,
   useTypeOptions
-} from "./chunk-TJPQDQNI.mjs";
+} from "./chunk-7EV4SN47.mjs";
 import {
   SpaceCapabilities
-} from "./chunk-Z7BB6HC2.mjs";
+} from "./chunk-WWGV5FJM.mjs";
 import {
   COMPOSER_SPACE_LOCK,
   getSpaceDisplayName
-} from "./chunk-VH2EBZEV.mjs";
+} from "./chunk-I6FZP42D.mjs";
 import {
   SpaceAction,
   SpaceForm
-} from "./chunk-2PN7QNGV.mjs";
+} from "./chunk-X34VDVMY.mjs";
 import {
   meta
 } from "./chunk-BDEFTL6K.mjs";
@@ -124,42 +124,42 @@ var AwaitingObject = ({ id }) => {
 import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
 import * as Effect from "effect/Effect";
 import * as Function2 from "effect/Function";
-import React3, { useCallback as useCallback3, useRef, useState as useState2 } from "react";
+import * as Option2 from "effect/Option";
+import React3, { useCallback as useCallback3, useMemo, useRef, useState as useState2 } from "react";
 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 { useIntentDispatcher as useIntentDispatcher2, usePluginManager } from "@dxos/app-framework/react";
+import { Obj as Obj2, Type } from "@dxos/echo";
+import { EntityKind, SystemTypeAnnotation, getTypeAnnotation as getTypeAnnotation2 } from "@dxos/echo/internal";
 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 { getSpace, isLiveObject, isSpace, useSpaces } from "@dxos/react-client/echo";
 import { Dialog, IconButton, useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { cardDialogContent, cardDialogHeader } from "@dxos/react-ui-stack";
-import { Collection, StoredSchema, getTypenameFromQuery } from "@dxos/schema";
-import { isNonNullable as isNonNullable2 } from "@dxos/util";
 
 // src/components/CreateDialog/CreateObjectPanel.tsx
 import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
 import * as Option from "effect/Option";
 import React2, { useCallback as useCallback2 } from "react";
-import { Type } from "@dxos/echo";
-import { ViewAnnotation, getTypeAnnotation } from "@dxos/echo/internal";
+import { getTypeAnnotation } from "@dxos/echo/internal";
 import { Icon as Icon2, toLocalizedString, useDefaultValue, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { Form } from "@dxos/react-ui-form";
 import { SearchList } from "@dxos/react-ui-searchlist";
 import { cardDialogOverflow, cardDialogPaddedOverflow, cardDialogSearchListRoot } from "@dxos/react-ui-stack";
+import { ViewAnnotation } from "@dxos/schema";
 import { isNonNullable } from "@dxos/util";
-var CreateObjectPanel = ({ forms, spaces, typename, target, views, initialFormValues: _initialFormValues, defaultSpaceId, resolve, onTargetChange, onTypenameChange, onCreateObject }) => {
+var CreateObjectPanel = ({ schemas, spaces, typename, target, views, initialFormValues: _initialFormValues, defaultSpaceId, resolve, onTargetChange, onTypenameChange, onCreateObject }) => {
   var _effect = _useSignals2();
   try {
     const { t } = useTranslation2(meta.id);
     const initialFormValues = useDefaultValue(_initialFormValues, () => ({}));
-    const form = forms.find((form2) => Type.getTypename(form2.objectSchema) === typename);
-    const options = forms.filter((form2) => {
+    const metadata = typename && resolve?.(typename);
+    const options = schemas.filter((schema) => {
       if (views == null) {
         return true;
       } else {
-        return views === ViewAnnotation.get(form2.objectSchema).pipe(Option.getOrElse(() => false));
+        return views === ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false));
       }
-    }).map((form2) => getTypeAnnotation(form2.objectSchema)).filter(isNonNullable).sort((a, b) => {
+    }).map((schema) => getTypeAnnotation(schema)).filter(isNonNullable).sort((a, b) => {
       const nameA = t("typename label", {
         ns: a.typename,
         defaultValue: a.typename
@@ -171,34 +171,34 @@ var CreateObjectPanel = ({ forms, spaces, typename, target, views, initialFormVa
       return nameA.localeCompare(nameB);
     });
     const handleCreateObject = useCallback2(async (props) => {
-      if (!form) {
+      if (!metadata) {
         return;
       }
       await onCreateObject?.({
-        form,
+        metadata,
         data: props
       });
     }, [
       onCreateObject,
-      form
+      metadata
     ]);
     const handleSetTypename = useCallback2(async (typename2) => {
-      const form2 = forms.find((form3) => getTypeAnnotation(form3.objectSchema)?.typename === typename2);
-      if (form2 && !form2.formSchema) {
+      const metadata2 = resolve?.(typename2);
+      if (metadata2 && !metadata2.inputSchema) {
         await onCreateObject?.({
-          form: form2
+          metadata: metadata2
         });
       } else {
         onTypenameChange?.(typename2);
       }
     }, [
-      forms,
+      resolve,
       onCreateObject
     ]);
     const inputSurfaceLookup = useInputSurfaceLookup({
       target
     });
-    return !form ? /* @__PURE__ */ React2.createElement(SelectSchema, {
+    return !metadata ? /* @__PURE__ */ React2.createElement(SelectSchema, {
       options,
       resolve,
       onChange: handleSetTypename
@@ -206,13 +206,13 @@ var CreateObjectPanel = ({ forms, spaces, typename, target, views, initialFormVa
       spaces,
       defaultSpaceId,
       onChange: onTargetChange
-    }) : form.formSchema ? /* @__PURE__ */ React2.createElement("div", {
+    }) : metadata.inputSchema ? /* @__PURE__ */ React2.createElement("div", {
       role: "none",
       className: cardDialogOverflow
     }, /* @__PURE__ */ React2.createElement(Form, {
       autoFocus: true,
       values: initialFormValues,
-      schema: form.formSchema,
+      schema: metadata.inputSchema,
       testId: "create-object-form",
       onSave: handleCreateObject,
       lookupComponent: inputSurfaceLookup,
@@ -286,7 +286,7 @@ var SelectSchema = ({ options, resolve, onChange }) => {
     }, /* @__PURE__ */ React2.createElement("span", {
       className: "flex gap-2 items-center grow truncate"
     }, /* @__PURE__ */ React2.createElement(Icon2, {
-      icon: resolve?.(option.typename).icon ?? "ph--placeholder--regular",
+      icon: resolve?.(option.typename)?.icon ?? "ph--placeholder--regular",
       size: 5
     }), t("typename label", {
       ns: option.typename,
@@ -306,19 +306,27 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
     const manager = usePluginManager();
     const { t } = useTranslation3(meta.id);
     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(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 ?? {}, [
+    const resolve = useCallback3((typename2) => {
+      const metadata = manager.context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename2)?.metadata;
+      return metadata?.createObjectIntent ? metadata : void 0;
+    }, [
       manager
     ]);
-    const handleCreateObject = useCallback3(({ form, data = {} }) => Effect.gen(function* () {
+    const space = isSpace(target) ? target : getSpace(target);
+    const schemas = space?.db.schemaRegistry.query({
+      location: [
+        "runtime"
+      ]
+    }).runSync();
+    const userSchemas = useMemo(() => schemas?.filter((schema) => getTypeAnnotation2(schema)?.kind !== EntityKind.Relation).filter((schema) => !!resolve(Type.getTypename(schema))).filter((schema) => !SystemTypeAnnotation.get(schema).pipe(Option2.getOrElse(() => false))) ?? [], [
+      schemas
+    ]);
+    const handleCreateObject = useCallback3(({ metadata, data = {} }) => Effect.gen(function* () {
       if (!target) {
         return;
       }
@@ -326,18 +334,18 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
       const space2 = isSpace(target) ? target : getSpace(target);
       invariant(space2, "Missing space", {
         F: __dxlog_file,
-        L: 77,
+        L: 87,
         S: this,
         A: [
           "space",
           "'Missing space'"
         ]
       });
-      const { object } = yield* dispatch(form.getIntent(data, {
+      const { object } = yield* dispatch(metadata.createObjectIntent(data, {
         space: space2
       }));
-      if (isLiveObject(object) && !Obj2.instanceOf(StoredSchema, object)) {
-        const hidden = form.hidden || hiddenTypenames.includes(Type2.getTypename(form.objectSchema));
+      if (isLiveObject(object) && !Obj2.instanceOf(Type.PersistentType, object)) {
+        const hidden = !metadata.addToCollectionOnCreate;
         const addObjectIntent = createIntent2(SpaceAction.AddObject, {
           target,
           object,
@@ -357,7 +365,6 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
       dispatch,
       target,
       resolve,
-      hiddenTypenames,
       _shouldNavigate
     ]);
     return (
@@ -371,7 +378,7 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
       }, /* @__PURE__ */ React3.createElement(Dialog.Title, null, t("create object dialog title", {
         object: t("typename label", {
           ns: typename,
-          defaultValue: views ? "View" : "Item"
+          defaultValue: views ? "View" : "Object"
         })
       })), /* @__PURE__ */ React3.createElement(Dialog.Close, {
         asChild: true
@@ -385,7 +392,7 @@ var CreateObjectDialog = ({ target: initialTarget, typename: initialTypename, vi
         variant: "ghost",
         autoFocus: true
       }))), /* @__PURE__ */ React3.createElement(CreateObjectPanel, {
-        forms,
+        schemas: userSchemas,
         spaces,
         target,
         views,
@@ -616,7 +623,7 @@ var JoinDialog = ({ navigableCollections, onDone, ...props }) => {
 
 // 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 React7, { useCallback as useCallback6, useMemo as useMemo2, useState as useState3 } from "react";
 import { QR } from "react-qr-rounded";
 import { createIntent as createIntent5 } from "@dxos/app-framework";
 import { useIntentDispatcher as useIntentDispatcher5 } from "@dxos/app-framework/react";
@@ -628,7 +635,7 @@ import { Invitation, InvitationEncoder } from "@dxos/react-client/invitations";
 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 { Collection as Collection2 } from "@dxos/schema";
+import { Collection } 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/MembersContainer.tsx";
@@ -663,7 +670,7 @@ var MembersContainer = ({ space, createInvitationUrl }) => {
       setInternalActiveAction(nextAction);
       localStorage.setItem(activeActionKey, nextAction);
     };
-    const target = space.properties[Collection2.Collection.typename]?.target?.objects[0]?.target;
+    const target = space.properties[Collection.Collection.typename]?.target?.objects[0]?.target;
     const locked = space.properties[COMPOSER_SPACE_LOCK];
     const handleChangeLocked = useCallback6(() => {
       space.properties[COMPOSER_SPACE_LOCK] = !locked;
@@ -671,7 +678,7 @@ var MembersContainer = ({ space, createInvitationUrl }) => {
       locked,
       space
     ]);
-    const inviteActions = useMemo(() => ({
+    const inviteActions = useMemo2(() => ({
       inviteOne: {
         label: t("invite one label", {
           ns: "os"
@@ -1082,7 +1089,7 @@ var useQuerySpaceSchemas = (space) => {
 
 // src/components/SpacePresence/SpacePresence.tsx
 import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
-import * as Option2 from "effect/Option";
+import * as Option3 from "effect/Option";
 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";
@@ -1093,6 +1100,21 @@ import { useIdentity } from "@dxos/react-client/halo";
 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";
+
+// src/capabilities/index.ts
+import { lazy } from "@dxos/app-framework";
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-T6VJKIOA.mjs"));
+var AppGraphSerializer = lazy(() => import("./app-graph-serializer-2NLWWFUB.mjs"));
+var IdentityCreated = lazy(() => import("./identity-created-OXLKCJE3.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-4PHJWDXW.mjs"));
+var ReactRoot = lazy(() => import("./react-root-O5I5CDJ7.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-J3XDMU2D.mjs"));
+var Repair = lazy(() => import("./repair-EHZS6MFY.mjs"));
+var SpaceSettings = lazy(() => import("./settings-MNQTKHL7.mjs"));
+var SpaceState = lazy(() => import("./state-45TXZQJ6.mjs"));
+var SpacesReady = lazy(() => import("./spaces-ready-ZPU24DA2.mjs"));
+
+// src/components/SpacePresence/SpacePresence.tsx
 var REFRESH_INTERVAL = 5e3;
 var ACTIVITY_DURATION = 3e4;
 var noViewers = new ComplexMap(PublicKey.hash);
@@ -1220,7 +1242,7 @@ var SmallPresenceLive = ({ id, open, viewers }) => {
     const attended = useAttended();
     const startOfAttention = attended.at(-1);
     const path = usePath(graph, startOfAttention);
-    const containsAttended = !open && !isAttended && id && Option2.isSome(path) ? path.value.includes(id) : false;
+    const containsAttended = !open && !isAttended && id && Option3.isSome(path) ? path.value.includes(id) : false;
     const getActiveViewers = (viewers2) => {
       const moment = Date.now();
       return Array.from(viewers2.values()).filter((viewer) => moment - viewer.lastSeen < ACTIVITY_DURATION);
@@ -1321,13 +1343,13 @@ var SpacePluginSettings = ({ settings }) => {
 import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
 import * as Function3 from "effect/Function";
 import * as Schema from "effect/Schema";
-import React14, { useCallback as useCallback10, useMemo as useMemo2, useState as useState8 } from "react";
+import React14, { useCallback as useCallback10, useMemo as useMemo3, 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 { useCapabilities, 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 { SpaceState as SpaceState2 } from "@dxos/react-client/echo";
 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";
@@ -1344,14 +1366,14 @@ var SpaceSettingsContainer = ({ space }) => {
     const { t } = useTranslation14(meta.id);
     const { dispatchPromise: dispatch } = useIntentDispatcher9();
     const client = useClient7();
-    const archived = useMulticastObservable(space.state) === SpaceState.SPACE_INACTIVE;
+    const archived = useMulticastObservable(space.state) === SpaceState2.SPACE_INACTIVE;
     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: 57,
+          L: 58,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1388,7 +1410,7 @@ var SpaceSettingsContainer = ({ space }) => {
       toggleEdgeReplication,
       archived
     ]);
-    const values = useMemo2(() => ({
+    const values = useMemo3(() => ({
       name: space.properties.name,
       icon: space.properties.icon,
       hue: space.properties.hue,
@@ -1401,7 +1423,7 @@ var SpaceSettingsContainer = ({ space }) => {
       edgeReplication,
       archived
     ]);
-    const customElements = useMemo2(() => ({
+    const customElements = useMemo3(() => ({
       name: ({ type, label, getValue, onValueChange }) => {
         const handleChange = useCallback10(({ target: { value: value2 } }) => onValueChange(type, value2), [
           onValueChange,
@@ -1498,6 +1520,17 @@ var SpaceSettingsContainer = ({ space }) => {
       space,
       download
     ]);
+    const repairs = useCapabilities(SpaceCapabilities.Repair);
+    const handleRepair = useCallback10(async () => {
+      await Promise.all(repairs.map((repair) => repair({
+        space,
+        isDefault: client.spaces.default === space
+      })));
+    }, [
+      client,
+      space,
+      repairs
+    ]);
     return /* @__PURE__ */ React14.createElement(StackItem3.Content, {
       scrollable: true
     }, /* @__PURE__ */ React14.createElement(ControlPage4, null, /* @__PURE__ */ React14.createElement(ControlSection4, {
@@ -1515,8 +1548,18 @@ 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", {
+    })), /* @__PURE__ */ React14.createElement(ControlSection4, {
+      title: t("space controls title", {
+        ns: meta.id
+      }),
+      description: t("space controls description", {
+        ns: meta.id
+      })
+    }, /* @__PURE__ */ React14.createElement("div", {
+      role: "none",
+      className: "container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]"
+    }, /* @__PURE__ */ React14.createElement(ControlItemInput3, {
+      title: t("backup space title", {
         ns: meta.id
       }),
       description: t("backup space description", {
@@ -1524,7 +1567,16 @@ var SpaceSettingsContainer = ({ space }) => {
       })
     }, /* @__PURE__ */ React14.createElement(Button5, {
       onClick: handleBackup
-    }, t("download backup")))));
+    }, t("download backup label"))), /* @__PURE__ */ React14.createElement(ControlItemInput3, {
+      title: t("repair space title", {
+        ns: meta.id
+      }),
+      description: t("repair space description", {
+        ns: meta.id
+      })
+    }, /* @__PURE__ */ React14.createElement(Button5, {
+      onClick: handleRepair
+    }, t("repair space label")))))));
   } finally {
     _effect.f();
   }
@@ -1532,7 +1584,7 @@ var SpaceSettingsContainer = ({ space }) => {
 
 // src/components/SyncStatus/InlineSyncStatus.tsx
 import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import * as Option3 from "effect/Option";
+import * as Option4 from "effect/Option";
 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";
@@ -1564,7 +1616,7 @@ var InlineSyncStatus = ({ space, open }) => {
     const attended = useAttended2();
     const startOfAttention = attended.at(-1);
     const path = usePath(graph, startOfAttention);
-    const containsAttended = !open && !isAttended && id && Option3.isSome(path) ? path.value.includes(id) : false;
+    const containsAttended = !open && !isAttended && id && Option4.isSome(path) ? path.value.includes(id) : false;
     const connectedToEdge = useEdgeStatus() === EdgeStatus.ConnectionState.CONNECTED;
     const edgeSyncEnabled = space.internal.data.edgeReplication === EdgeReplicationSetting2.ENABLED;
     const syncState = useSpaceSyncState(space);
@@ -1826,16 +1878,16 @@ 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 Option5 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 { DXN, Filter as Filter2, Query } from "@dxos/echo";
+import { ReferenceAnnotationId, getTypeAnnotation as getTypeAnnotation3, 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,
+    Query,
     Filter: Filter2,
     Person
   };
@@ -1848,26 +1900,26 @@ var evalQuery = (queryString) => {
       S: void 0,
       C: (f, a) => f(...a)
     });
-    return Query2.select(Filter2.nothing());
+    return Query.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();
+      return Option5.none();
     }
     const staticSchema = client.graph.schemaRegistry.getSchema(typename);
     if (staticSchema) {
-      return Option4.some(staticSchema);
+      return Option5.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 Array2.head(schemas);
   });
-  return resolveSchema(query, resolve).pipe(Effect3.map((schema) => Option4.getOrUndefined(schema)), Effect3.runPromise);
+  return resolveSchema(query, resolve).pipe(Effect3.map((schema) => Option5.getOrUndefined(schema)), Effect3.runPromise);
 };
 var resolveSchema = (query, resolve) => {
   return Match.value(query).pipe(
@@ -1875,46 +1927,46 @@ var resolveSchema = (query, resolve) => {
     // 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())))),
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option5.map((typename) => resolve(typename)), Option5.getOrElse(() => Effect3.succeed(Option5.none())))),
     Match.when({
       type: "filter"
-    }, ({ filter }) => typenameFromFilter(filter).pipe(Option4.map((typename) => resolve(typename)), Option4.getOrElse(() => Effect3.succeed(Option4.none())))),
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option5.map((typename) => resolve(typename)), Option5.getOrElse(() => Effect3.succeed(Option5.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()),
+    }, ({ anchor, property }) => resolveSchema(anchor, resolve).pipe(Effect3.map((base) => base.pipe(Option5.map((schema) => SchemaAST.getPropertySignatures(schema.ast)), Option5.flatMap((properties) => Array2.findFirst(properties, (p) => p.name === property)), Option5.flatMap((property2) => SchemaAST.getAnnotation(ReferenceAnnotationId)(unwrapOptional(property2))), Option5.map((annotation) => annotation.typename))), Effect3.flatMap(Option5.match({
+      onNone: () => Effect3.succeed(Option5.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())))),
+    }, ({ filter }) => typenameFromFilter(filter).pipe(Option5.map((typename) => resolve(typename)), Option5.getOrElse(() => Effect3.succeed(Option5.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()),
+    }, ({ anchor, direction }) => resolveSchema(anchor, resolve).pipe(Effect3.map((base) => base.pipe(Option5.map((schema) => getTypeAnnotation3(schema)), Option5.flatMap((annotation) => Option5.fromNullable(direction === "source" ? annotation?.sourceSchema : annotation?.targetSchema)))), Effect3.flatMap(Option5.match({
+      onNone: () => Effect3.succeed(Option5.none()),
       onSome: (typename) => resolve(typename)
     })))),
     Match.when({
       type: "options"
     }, ({ query: query2 }) => resolveSchema(query2, resolve)),
     Match.orElse((_q) => {
-      return Effect3.succeed(Option4.none());
+      return Effect3.succeed(Option5.none());
     })
   );
 };
 var typenameFromFilter = (filter) => Match.value(filter).pipe(Match.withReturnType(), Match.when({
   type: "object"
-}, ({ typename }) => Option4.fromNullable(typename)), Match.when({
+}, ({ typename }) => Option5.fromNullable(typename)), Match.when({
   type: "and"
-}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option4.isSome), Option4.flatten)), Match.when({
+}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option5.isSome), Option5.flatten)), Match.when({
   type: "or"
-}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option4.isSome), Option4.flatten)), Match.orElse(() => Option4.none()));
+}, ({ filters }) => EffectFunction.pipe(filters, Array2.map(typenameFromFilter), Array2.findFirst(Option5.isSome), Option5.flatten)), Match.orElse(() => Option5.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));
+    return Option5.fromNullable(options.queues).pipe(Option5.flatMap((queues) => Array2.head(queues)), Option5.flatMap((queueDxn) => Option5.fromNullable(DXN.tryParse(queueDxn))), Option5.flatMap((queueDxn) => Option5.fromNullable(space?.queues.get(queueDxn))), Option5.getOrElse(() => space));
   }), Match.orElse(() => space));
 };
 
@@ -1924,9 +1976,9 @@ 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 { DXN as DXN2, Filter as Filter3, Obj as Obj6, Query as Query2, Tag, Type as Type2 } from "@dxos/echo";
 import { useClient as useClient10 } from "@dxos/react-client";
-import { getSpace as getSpace4, useQuery as useQuery3 } from "@dxos/react-client/echo";
+import { getSpace as getSpace4, useQuery as useQuery2 } from "@dxos/react-client/echo";
 import { useAsyncEffect } from "@dxos/react-ui";
 import { ViewEditor as NaturalViewEditor } from "@dxos/react-ui-form";
 import { View } from "@dxos/schema";
@@ -1937,14 +1989,21 @@ var ViewEditor = ({ view }) => {
     const client = useClient10();
     const space = getSpace4(view);
     const [schema, setSchema] = useState11(() => Schema2.Struct({}));
-    const tags = useQuery3(space, Filter3.type(Tag.Tag));
+    const tags = useQuery2(space, Filter3.type(Tag.Tag));
     const types = useTypeOptions({
       space,
-      annotation: [
-        "dynamic",
-        "limited-static",
-        "object-form"
-      ]
+      annotation: {
+        location: [
+          "database",
+          "runtime"
+        ],
+        kind: [
+          "user"
+        ],
+        registered: [
+          "registered"
+        ]
+      }
     });
     useAsyncEffect(async () => {
       if (!view?.query || !space) {
@@ -1965,11 +2024,11 @@ var ViewEditor = ({ view }) => {
         return;
       }
       const queue = target && DXN2.tryParse(target) ? target : void 0;
-      const query = queue ? Query3.fromAst(newQuery).options({
+      const query = queue ? Query2.fromAst(newQuery).options({
         queues: [
           queue
         ]
-      }) : Query3.fromAst(newQuery);
+      }) : Query2.fromAst(newQuery);
       view.query.ast = query.ast;
       const newSchema = await resolveSchemaWithClientAndSpace(client, space, query.ast);
       if (!newSchema) {
@@ -1977,8 +2036,7 @@ var ViewEditor = ({ view }) => {
       }
       const newView = View.make({
         query,
-        jsonSchema: Type3.toJsonSchema(newSchema),
-        presentation: Obj6.make(Type3.Expando, {})
+        jsonSchema: Type2.toJsonSchema(newSchema)
       });
       view.projection = Obj6.getSnapshot(newView).projection;
       setSchema(() => newSchema);
@@ -2002,12 +2060,12 @@ var ViewEditor = ({ view }) => {
       registry: space.db.schemaRegistry,
       schema,
       view,
-      mode: "query",
+      mode: "tag",
       outerSpacing: false,
       tags,
       types,
       onQueryChanged: handleQueryChanged,
-      onDelete: Type3.isMutable(schema) ? handleDelete : void 0
+      onDelete: Type2.isMutable(schema) ? handleDelete : void 0
     });
   } finally {
     _effect.f();
@@ -2015,11 +2073,11 @@ var ViewEditor = ({ view }) => {
 };
 
 // src/components/index.ts
-import { lazy } from "react";
-var CollectionArticle = lazy(() => import("./CollectionArticle-KHXYT3SH.mjs"));
-var ObjectDetailsPanel = lazy(() => import("./ObjectDetailsPanel-6PZQIQG3.mjs"));
-var ObjectSettingsContainer = lazy(() => import("./ObjectSettings-OQSBOH7K.mjs"));
-var RecordArticle = lazy(() => import("./RecordArticle-NACBH42P.mjs"));
+import { lazy as lazy2 } from "react";
+var CollectionArticle = lazy2(() => import("./CollectionArticle-KHXYT3SH.mjs"));
+var ObjectDetailsPanel = lazy2(() => import("./ObjectDetailsPanel-6OFTT3GG.mjs"));
+var ObjectSettingsContainer = lazy2(() => import("./ObjectSettings-YXPJQMJ5.mjs"));
+var RecordArticle = lazy2(() => import("./RecordArticle-SSJ7PULS.mjs"));
 
 export {
   AwaitingObject,
@@ -2054,6 +2112,16 @@ export {
   CollectionArticle,
   ObjectDetailsPanel,
   ObjectSettingsContainer,
-  RecordArticle
+  RecordArticle,
+  AppGraphBuilder,
+  AppGraphSerializer,
+  IdentityCreated,
+  IntentResolver,
+  ReactRoot,
+  ReactSurface,
+  Repair,
+  SpaceSettings,
+  SpaceState,
+  SpacesReady
 };
-//# sourceMappingURL=chunk-ITQFSFQ3.mjs.map
+//# sourceMappingURL=chunk-JAMGJUFU.mjs.map