@dxos/echo 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/dist/lib/{browser/chunk-6XVZF5VJ.mjs → neutral/chunk-VJ2H5MOJ.mjs}

@@ -1,14 +1,19 @@
-import "@dxos/node-std/globals";
 import {
   CurrencyAnnotationId,
   FormatAnnotation,
   FormatAnnotationId,
   TypeFormat
-} from "./chunk-RP4JV7FD.mjs";
+} from "./chunk-7WE7SBA2.mjs";
 import {
+  Service
+} from "./chunk-B4FLOYG7.mjs";
+import {
+  ATTR_PARENT,
   ATTR_TYPE,
   GeneratorAnnotationId,
+  LabelAnnotation,
   LabelAnnotationId,
+  ParentId,
   PropertyMetaAnnotationId,
   ReferenceAnnotationId,
   SchemaId,
@@ -18,25 +23,34 @@ import {
   TypeIdentifierAnnotationId,
   TypenameSchema,
   VersionSchema,
+  getDescriptionWithSchema,
   getEntityKind,
+  getLabelWithSchema,
+  getSchema,
   getSchemaDXN,
   getSchemaTypename,
   getTypeAnnotation,
   getTypeDXN,
   getTypeIdentifierAnnotation,
   getTypename,
+  setDescriptionWithSchema,
+  setLabelWithSchema,
   setSchema,
   setTypename
-} from "./chunk-WABSVOOX.mjs";
+} from "./chunk-RIMHNJ3E.mjs";
 import {
+  ANY_OBJECT_TYPENAME,
+  ANY_OBJECT_VERSION,
   EntityKind,
   EntityKindSchema,
   KindId,
+  SchemaKindId,
+  SnapshotKindId,
   makeTypeJsonSchemaAnnotation
-} from "./chunk-QU7PWSZD.mjs";
+} from "./chunk-KB7RIVLK.mjs";
 
 // src/internal/index.ts
-import { JsonPath as JsonPath2, JsonProp, getValue, setValue, splitJsonPath } from "@dxos/effect";
+import { JsonPath as JsonPath2, JsonProp, getValue, splitJsonPath } from "@dxos/effect";
 
 // src/internal/types/base.ts
 import * as Schema from "effect/Schema";
@@ -55,22 +69,22 @@ import { intersection } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/types/meta.ts";
 var ATTR_META = "@meta";
 var MetaId = Symbol.for("@dxos/echo/Meta");
-var ObjectMetaSchema = Schema2.mutable(Schema2.Struct({
-  keys: Schema2.mutable(Schema2.Array(ForeignKey)),
+var ObjectMetaSchema = Schema2.Struct({
+  keys: Schema2.Array(ForeignKey),
   /**
-   * A set of tags.
-   * Tags are arbitrary application-defined strings.
-   * ECHO makes no assumptions about the tag structure.
-   */
+  * A set of tags.
+  * Tags are arbitrary application-defined strings.
+  * ECHO makes no assumptions about the tag structure.
+  */
   // TODO(dmaretskyi): Has to be optional for compatibility with old data.
   // Defaulting to an empty array is possible but requires a bit more work.
-  tags: Schema2.optional(Schema2.mutable(Schema2.Array(Schema2.String)))
-}));
+  tags: Schema2.optional(Schema2.Array(Schema2.String))
+});
 var getMeta = (obj) => {
   const metadata = obj[MetaId];
   invariant(metadata, "ObjectMeta not found.", {
     F: __dxlog_file,
-    L: 53,
+    L: 52,
     S: void 0,
     A: [
       "metadata",
@@ -79,14 +93,6 @@ var getMeta = (obj) => {
   });
   return metadata;
 };
-var splitMeta = (object) => {
-  const meta = object[ATTR_META];
-  delete object[ATTR_META];
-  return {
-    meta,
-    object
-  };
-};
 var foreignKey = (source, id) => ({
   source,
   id
@@ -97,127 +103,86 @@ var compareForeignKeys = (a, b) => intersection(getMeta(a).keys, getMeta(b).keys
 // src/internal/types/version.ts
 var VersionTypeId = Symbol.for("@dxos/echo/VersionTypeId");
 
-// src/internal/entities/expando.ts
-import * as Schema5 from "effect/Schema";
+// src/internal/api/annotations.ts
+var getLabel = (entity) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    return getLabelWithSchema(schema, entity);
+  }
+};
+var setLabel = (entity, label) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    setLabelWithSchema(schema, entity, label);
+  }
+};
+var getDescription = (entity) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    return getDescriptionWithSchema(schema, entity);
+  }
+};
+var setDescription = (entity, description) => {
+  const schema = getSchema(entity);
+  if (schema != null) {
+    setDescriptionWithSchema(schema, entity, description);
+  }
+};
 
-// src/internal/entities/object.ts
-import * as Schema4 from "effect/Schema";
-import * as SchemaAST2 from "effect/SchemaAST";
-import { invariant as invariant2 } from "@dxos/invariant";
+// src/internal/api/entity.ts
+import { invariant as invariant6 } from "@dxos/invariant";
+import { assumeType as assumeType3 } from "@dxos/util";
 
 // src/internal/entities/entity.ts
 import * as Schema3 from "effect/Schema";
-var makeEchoTypeSchema = (ast, typename, version) => {
+var makeEchoTypeSchema = (fields, ast, typename, version2, kind) => {
   return class EchoObjectSchemaClass extends Schema3.make(ast) {
     static typename = typename;
-    static version = version;
+    static version = version2;
+    static [SchemaKindId] = kind;
+    static fields = fields;
     static annotations(annotations4) {
       const schema = Schema3.make(ast).annotations(annotations4);
-      return makeEchoTypeSchema(
-        /* fields, */
-        schema.ast,
-        typename,
-        version
-      );
+      return makeEchoTypeSchema(fields, schema.ast, typename, version2, kind);
     }
     // static make(
     //   props: RequiredKeys<Schema.TypeLiteral.Constructor<Fields, []>> extends never
     //     ? void | Simplify<Schema.TypeLiteral.Constructor<Fields, []>>
     //     : Simplify<Schema.TypeLiteral.Constructor<Fields, []>>,
-    //   options?: MakeOptions,
+    //   options?: MakeProps,
     // ): Simplify<Schema.TypeLiteral.Type<Fields, []>> {
     //   const propsWithDefaults: any = _lazilyMergeDefaults(fields, { ...(props as any) });
     //   return _getDisableValidationMakeOption(options)
     //     ? propsWithDefaults
     //     : ParseResult.validateSync(this)(propsWithDefaults);
     // }
-    static instanceOf(value) {
-      return Schema3.is(this)(value);
+    static instanceOf(value2) {
+      return Schema3.is(this)(value2);
     }
   };
 };
 
-// src/internal/entities/object.ts
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/object.ts";
-var EchoObjectSchema = ({ typename, version }) => {
-  return (self) => {
-    invariant2(typeof TypeAnnotationId === "symbol", "Sanity.", {
-      F: __dxlog_file2,
-      L: 25,
-      S: void 0,
-      A: [
-        "typeof TypeAnnotationId === 'symbol'",
-        "'Sanity.'"
-      ]
-    });
-    invariant2(SchemaAST2.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
-      F: __dxlog_file2,
-      L: 26,
-      S: void 0,
-      A: [
-        "SchemaAST.isTypeLiteral(self.ast)",
-        "'Schema must be a TypeLiteral.'"
-      ]
-    });
-    const schemaWithId = Schema4.extend(Schema4.mutable(self), Schema4.Struct({
-      id: Schema4.String
-    }));
-    const ast = SchemaAST2.annotations(schemaWithId.ast, {
-      // TODO(dmaretskyi): `extend` kills the annotations.
-      ...self.ast.annotations,
-      [TypeAnnotationId]: {
-        kind: EntityKind.Object,
-        typename,
-        version
-      },
-      // TODO(dmaretskyi): TypeIdentifierAnnotationId?
-      [SchemaAST2.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
-        kind: EntityKind.Object,
-        typename,
-        version
-      })
-    });
-    return makeEchoTypeSchema(
-      /* self.fields, */
-      ast,
-      typename,
-      version
-    );
-  };
-};
-
-// src/internal/entities/expando.ts
-var EXPANDO_TYPENAME = "dxos.org/type/Expando";
-var ExpandoSchema = Schema5.Struct({}, {
-  key: Schema5.String,
-  value: Schema5.Any
-}).pipe(EchoObjectSchema({
-  typename: EXPANDO_TYPENAME,
-  version: "0.1.0"
-}));
-var Expando = ExpandoSchema;
-
 // src/internal/entities/model.ts
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { DXN as DXN2, ObjectId } from "@dxos/keys";
 import { assumeType } from "@dxos/util";
 
 // src/internal/entities/relation.ts
-import * as Schema6 from "effect/Schema";
-import * as SchemaAST3 from "effect/SchemaAST";
+import * as Schema4 from "effect/Schema";
+import * as SchemaAST2 from "effect/SchemaAST";
 import { raise } from "@dxos/debug";
-import { assertArgument, invariant as invariant3 } from "@dxos/invariant";
+import { assertArgument, invariant as invariant2 } from "@dxos/invariant";
 import { DXN } from "@dxos/keys";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/relation.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/relation.ts";
 var ATTR_RELATION_SOURCE = "@relationSource";
 var RelationSourceId = Symbol.for("@dxos/echo/RelationSource");
 var RelationSourceDXNId = Symbol.for("@dxos/echo/RelationSourceDXN");
 var ATTR_RELATION_TARGET = "@relationTarget";
 var RelationTargetId = Symbol.for("@dxos/echo/RelationTarget");
 var RelationTargetDXNId = Symbol.for("@dxos/echo/RelationTargetDXN");
-var EchoRelationSchema = ({ source, target, typename, version }) => {
-  assertArgument(Schema6.isSchema(source), "source");
-  assertArgument(Schema6.isSchema(target), "target");
+var EchoRelationSchema = ({ source, target, typename, version: version2 }) => {
+  assertArgument(Schema4.isSchema(source), "source");
+  assertArgument(Schema4.isSchema(target), "target");
   const sourceDXN = getDXNForRelationSchemaRef(source);
   const targetDXN = getDXNForRelationSchemaRef(target);
   if (getEntityKind(source) !== EntityKind.Object) {
@@ -227,47 +192,43 @@ var EchoRelationSchema = ({ source, target, typename, version }) => {
     raise(new Error("Target schema must be an echo object schema."));
   }
   return (self) => {
-    invariant3(SchemaAST3.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
-      F: __dxlog_file3,
-      L: 112,
+    invariant2(SchemaAST2.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
+      F: __dxlog_file2,
+      L: 127,
       S: void 0,
       A: [
         "SchemaAST.isTypeLiteral(self.ast)",
         "'Schema must be a TypeLiteral.'"
       ]
     });
-    const schemaWithId = Schema6.extend(Schema6.mutable(self), Schema6.Struct({
-      id: Schema6.String
+    const fields = self.fields ?? {};
+    const schemaWithId = Schema4.extend(self, Schema4.Struct({
+      id: Schema4.String
     }));
-    const ast = SchemaAST3.annotations(schemaWithId.ast, {
+    const ast = SchemaAST2.annotations(schemaWithId.ast, {
       // TODO(dmaretskyi): `extend` kills the annotations.
       ...self.ast.annotations,
       [TypeAnnotationId]: {
         kind: EntityKind.Relation,
         typename,
-        version,
+        version: version2,
         sourceSchema: sourceDXN,
         targetSchema: targetDXN
       },
       // TODO(dmaretskyi): TypeIdentifierAnnotationId?
-      [SchemaAST3.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
+      [SchemaAST2.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
         kind: EntityKind.Relation,
         typename,
-        version,
+        version: version2,
         relationSource: sourceDXN,
         relationTarget: targetDXN
       })
     });
-    return makeEchoTypeSchema(
-      /* self.fields, */
-      ast,
-      typename,
-      version
-    );
+    return makeEchoTypeSchema(fields, ast, typename, version2, EntityKind.Relation);
   };
 };
 var getDXNForRelationSchemaRef = (schema) => {
-  assertArgument(Schema6.isSchema(schema), "schema");
+  assertArgument(Schema4.isSchema(schema), "schema");
   const identifier = getTypeIdentifierAnnotation(schema);
   if (identifier) {
     return identifier;
@@ -280,16 +241,17 @@ var getDXNForRelationSchemaRef = (schema) => {
 };
 
 // src/internal/entities/model.ts
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/model.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/model.ts";
 var ATTR_SELF_DXN = "@dxn";
 var SelfDXNId = Symbol.for("@dxos/echo/DXN");
 var ATTR_DELETED = "@deleted";
 var ObjectDeletedId = Symbol.for("@dxos/echo/Deleted");
 var ObjectVersionId = Symbol.for("@dxos/echo/Version");
+var ObjectDatabaseId = Symbol.for("@dxos/echo/Database");
 function assertObjectModel(obj) {
-  invariant4(typeof obj === "object" && obj !== null, "Invalid object model: not an object", {
-    F: __dxlog_file4,
-    L: 114,
+  invariant3(typeof obj === "object" && obj !== null, "Invalid object model: not an object", {
+    F: __dxlog_file3,
+    L: 123,
     S: this,
     A: [
       "typeof obj === 'object' && obj !== null",
@@ -297,27 +259,27 @@ function assertObjectModel(obj) {
     ]
   });
   assumeType(obj);
-  invariant4(ObjectId.isValid(obj.id), "Invalid object model: invalid id", {
-    F: __dxlog_file4,
-    L: 116,
+  invariant3(ObjectId.isValid(obj.id), "Invalid object model: invalid id", {
+    F: __dxlog_file3,
+    L: 125,
     S: this,
     A: [
       "ObjectId.isValid(obj.id)",
       "'Invalid object model: invalid id'"
     ]
   });
-  invariant4(obj[TypeId] === void 0 || obj[TypeId] instanceof DXN2, "Invalid object model: invalid type", {
-    F: __dxlog_file4,
-    L: 117,
+  invariant3(obj[TypeId] === void 0 || obj[TypeId] instanceof DXN2, "Invalid object model: invalid type", {
+    F: __dxlog_file3,
+    L: 126,
     S: this,
     A: [
       "obj[TypeId] === undefined || obj[TypeId] instanceof DXN",
       "'Invalid object model: invalid type'"
     ]
   });
-  invariant4(obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation, "Invalid object model: invalid entity kind", {
-    F: __dxlog_file4,
-    L: 118,
+  invariant3(obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation, "Invalid object model: invalid entity kind", {
+    F: __dxlog_file3,
+    L: 127,
     S: this,
     A: [
       "obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation",
@@ -325,36 +287,36 @@ function assertObjectModel(obj) {
     ]
   });
   if (obj[KindId] === EntityKind.Relation) {
-    invariant4(obj[RelationSourceDXNId] instanceof DXN2, "Invalid object model: invalid relation source", {
-      F: __dxlog_file4,
-      L: 124,
+    invariant3(obj[RelationSourceDXNId] instanceof DXN2, "Invalid object model: invalid relation source", {
+      F: __dxlog_file3,
+      L: 133,
       S: this,
       A: [
         "obj[RelationSourceDXNId] instanceof DXN",
         "'Invalid object model: invalid relation source'"
       ]
     });
-    invariant4(obj[RelationTargetDXNId] instanceof DXN2, "Invalid object model: invalid relation target", {
-      F: __dxlog_file4,
-      L: 125,
+    invariant3(obj[RelationTargetDXNId] instanceof DXN2, "Invalid object model: invalid relation target", {
+      F: __dxlog_file3,
+      L: 134,
       S: this,
       A: [
         "obj[RelationTargetDXNId] instanceof DXN",
         "'Invalid object model: invalid relation target'"
       ]
     });
-    invariant4(!(obj[RelationSourceId] instanceof DXN2), "Invalid object model: source pointer is a DXN", {
-      F: __dxlog_file4,
-      L: 126,
+    invariant3(!(obj[RelationSourceId] instanceof DXN2), "Invalid object model: source pointer is a DXN", {
+      F: __dxlog_file3,
+      L: 135,
       S: this,
       A: [
         "!(obj[RelationSourceId] instanceof DXN)",
         "'Invalid object model: source pointer is a DXN'"
       ]
     });
-    invariant4(!(obj[RelationTargetId] instanceof DXN2), "Invalid object model: target pointer is a DXN", {
-      F: __dxlog_file4,
-      L: 127,
+    invariant3(!(obj[RelationTargetId] instanceof DXN2), "Invalid object model: target pointer is a DXN", {
+      F: __dxlog_file3,
+      L: 136,
       S: this,
       A: [
         "!(obj[RelationTargetId] instanceof DXN)",
@@ -364,14 +326,62 @@ function assertObjectModel(obj) {
   }
 }
 
+// src/internal/entities/object.ts
+import * as Schema5 from "effect/Schema";
+import * as SchemaAST3 from "effect/SchemaAST";
+import { invariant as invariant4 } from "@dxos/invariant";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/object.ts";
+var EchoObjectSchema = ({ typename, version: version2 }) => {
+  return (self) => {
+    invariant4(typeof TypeAnnotationId === "symbol", "Sanity.", {
+      F: __dxlog_file4,
+      L: 37,
+      S: void 0,
+      A: [
+        "typeof TypeAnnotationId === 'symbol'",
+        "'Sanity.'"
+      ]
+    });
+    invariant4(SchemaAST3.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
+      F: __dxlog_file4,
+      L: 38,
+      S: void 0,
+      A: [
+        "SchemaAST.isTypeLiteral(self.ast)",
+        "'Schema must be a TypeLiteral.'"
+      ]
+    });
+    const fields = self.fields ?? {};
+    const schemaWithId = Schema5.extend(self, Schema5.Struct({
+      id: Schema5.String
+    }));
+    const ast = SchemaAST3.annotations(schemaWithId.ast, {
+      // TODO(dmaretskyi): `extend` kills the annotations.
+      ...self.ast.annotations,
+      [TypeAnnotationId]: {
+        kind: EntityKind.Object,
+        typename,
+        version: version2
+      },
+      // TODO(dmaretskyi): TypeIdentifierAnnotationId?
+      [SchemaAST3.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
+        kind: EntityKind.Object,
+        typename,
+        version: version2
+      })
+    });
+    return makeEchoTypeSchema(fields, ast, typename, version2, EntityKind.Object);
+  };
+};
+
 // src/internal/entities/util.ts
-import * as Schema7 from "effect/Schema";
+import * as Schema6 from "effect/Schema";
 import { assertArgument as assertArgument2, invariant as invariant5 } from "@dxos/invariant";
 import { DXN as DXN3, ObjectId as ObjectId2 } from "@dxos/keys";
 import { assumeType as assumeType2 } from "@dxos/util";
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/entities/util.ts";
 var getObjectDXN = (object) => {
-  invariant5(!Schema7.isSchema(object), "schema not allowed in this function", {
+  invariant5(!Schema6.isSchema(object), "schema not allowed in this function", {
     F: __dxlog_file5,
     L: 19,
     S: void 0,
@@ -400,6 +410,151 @@ var getObjectDXN = (object) => {
   return DXN3.fromLocalObjectId(object.id);
 };
 
+// src/internal/api/entity.ts
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/api/entity.ts";
+var getDXN = (entity) => {
+  const dxn = getObjectDXN(entity);
+  invariant6(dxn != null, "Invalid entity.", {
+    F: __dxlog_file6,
+    L: 18,
+    S: void 0,
+    A: [
+      "dxn != null",
+      "'Invalid entity.'"
+    ]
+  });
+  return dxn;
+};
+var getDatabase = (entity) => {
+  assumeType3(entity);
+  return entity[ObjectDatabaseId];
+};
+
+// src/internal/api/meta.ts
+import { assertArgument as assertArgument3, invariant as invariant7 } from "@dxos/invariant";
+var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/api/meta.ts";
+function getMetaChecked(entity) {
+  assertArgument3(entity, "entity", "Should be an entity.");
+  const meta = getMeta(entity);
+  invariant7(meta != null, "Invalid entity.", {
+    F: __dxlog_file7,
+    L: 34,
+    S: this,
+    A: [
+      "meta != null",
+      "'Invalid entity.'"
+    ]
+  });
+  return meta;
+}
+var getKeys = (entity, source) => {
+  assertArgument3(entity, "entity", "Should be an entity.");
+  const meta = getMetaChecked(entity);
+  invariant7(meta != null, "Invalid entity.", {
+    F: __dxlog_file7,
+    L: 45,
+    S: void 0,
+    A: [
+      "meta != null",
+      "'Invalid entity.'"
+    ]
+  });
+  return meta.keys.filter((key) => key.source === source);
+};
+var deleteKeys = (entity, source) => {
+  const meta = getMetaChecked(entity);
+  for (let i = 0; i < meta.keys.length; i++) {
+    if (meta.keys[i].source === source) {
+      meta.keys.splice(i, 1);
+      i--;
+    }
+  }
+};
+var addTag = (entity, tag) => {
+  const meta = getMetaChecked(entity);
+  meta.tags ??= [];
+  meta.tags.push(tag);
+};
+var removeTag = (entity, tag) => {
+  const meta = getMetaChecked(entity);
+  if (!meta.tags) {
+    return;
+  }
+  for (let i = 0; i < meta.tags.length; i++) {
+    if (meta.tags[i] === tag) {
+      meta.tags.splice(i, 1);
+      i--;
+    }
+  }
+};
+
+// src/internal/api/sorting.ts
+var compare = (a, b) => {
+  if (a == null) {
+    return b == null ? 0 : 1;
+  }
+  if (b == null) {
+    return -1;
+  }
+  return a.localeCompare(b);
+};
+var sortByLabel = (a, b) => compare(getLabel(a), getLabel(b));
+var sortByTypename = (a, b) => compare(getTypename(a), getTypename(b));
+var sort = (...comparators) => {
+  return (a, b) => {
+    for (const comparator of comparators) {
+      const result = comparator(a, b);
+      if (result !== 0) {
+        return result;
+      }
+    }
+    return 0;
+  };
+};
+
+// src/internal/api/version.ts
+import { assertArgument as assertArgument4 } from "@dxos/invariant";
+var unversioned = {
+  [VersionTypeId]: {},
+  versioned: false
+};
+var isVersion = (entity) => {
+  return entity != null && typeof entity === "object" && VersionTypeId in entity;
+};
+var version = (entity) => {
+  const ver = entity[ObjectVersionId];
+  if (ver === void 0) {
+    return unversioned;
+  }
+  return ver;
+};
+var versionValid = (ver) => {
+  assertArgument4(isVersion(ver), "version", "Invalid version object");
+  return !!ver.versioned;
+};
+var compareVersions = (version1, version2) => {
+  assertArgument4(isVersion(version1), "version1", "Invalid version object");
+  assertArgument4(isVersion(version2), "version2", "Invalid version object");
+  if (!versionValid(version1) || !versionValid(version2)) {
+    return "unversioned";
+  }
+  if (version1.automergeHeads?.length !== version2.automergeHeads?.length) {
+    return "different";
+  }
+  if (version1.automergeHeads?.some((head) => !version2.automergeHeads?.includes(head))) {
+    return "different";
+  }
+  return "equal";
+};
+var encodeVersion = (ver) => {
+  return JSON.stringify(ver);
+};
+var decodeVersion = (ver) => {
+  const parsed = JSON.parse(ver);
+  parsed[VersionTypeId] = {};
+  return parsed;
+};
+
 // src/internal/json-schema/annotations.ts
 import * as SchemaAST4 from "effect/SchemaAST";
 var CustomAnnotations = {
@@ -418,169 +573,169 @@ var EchoAnnotations = {
 };
 
 // src/internal/json-schema/json-schema-type.ts
-import * as Schema8 from "effect/Schema";
+import * as Schema7 from "effect/Schema";
 import { JsonPath } from "@dxos/effect";
-var SimpleTypes = Schema8.Literal("array", "boolean", "integer", "null", "number", "object", "string");
-var NonNegativeInteger = Schema8.Number.pipe(Schema8.greaterThanOrEqualTo(0));
-var StringArray = Schema8.Array(Schema8.String).pipe(Schema8.mutable);
-var JsonSchemaOrBoolean = Schema8.Union(Schema8.suspend(() => JsonSchemaType), Schema8.Boolean);
-var JsonSchemaEchoAnnotations = Schema8.Struct({
+var SimpleTypes = Schema7.Literal("array", "boolean", "integer", "null", "number", "object", "string");
+var NonNegativeInteger = Schema7.Number.pipe(Schema7.greaterThanOrEqualTo(0));
+var StringArray = Schema7.Array(Schema7.String);
+var JsonSchemaOrBoolean = Schema7.Union(Schema7.suspend(() => JsonSchemaType), Schema7.Boolean);
+var JsonSchemaEchoAnnotations = Schema7.Struct({
   /**
   * Label for this schema.
   * Mapped from {@link LabelAnnotationId}.
   */
-  labelProp: Schema8.optional(Schema8.Union(JsonPath, Schema8.Array(JsonPath))),
+  labelProp: Schema7.optional(Schema7.Union(JsonPath, Schema7.Array(JsonPath))),
   /**
   * Generator function for this schema.
   * Mapped from {@link GeneratorAnnotationId}.
   */
-  generator: Schema8.optional(Schema8.Union(Schema8.String, Schema8.Tuple(Schema8.String, Schema8.Number))),
+  generator: Schema7.optional(Schema7.Union(Schema7.String, Schema7.Tuple(Schema7.String, Schema7.Number))),
   /**
   * {@link PropertyMeta} annotations get serialized here.
   */
-  meta: Schema8.optional(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.Any
-  }).pipe(Schema8.mutable)),
+  meta: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.Any
+  })),
   /**
   * @deprecated
   */
   // TODO(dmaretskyi): We risk old schema not passing validation due to the extra fields. Remove when we are sure this is safe.
-  type: Schema8.optional(Schema8.Struct({
-    typename: Schema8.String,
-    version: Schema8.String,
+  type: Schema7.optional(Schema7.Struct({
+    typename: Schema7.String,
+    version: Schema7.String,
     // Not used.
-    schemaId: Schema8.optional(Schema8.String)
-  }).pipe(Schema8.mutable)),
+    schemaId: Schema7.optional(Schema7.String)
+  })),
   /**
   * @deprecated Superseded by `meta`.
   */
-  annotations: Schema8.optional(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.Any
-  }).pipe(Schema8.mutable))
-}).pipe(Schema8.mutable);
-var _JsonSchemaType = Schema8.Struct({
+  annotations: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.Any
+  }))
+});
+var _JsonSchemaType = Schema7.Struct({
   /**
   * Identifier for this schema.
   * This schema might be referenced by $ref clause in other schemas.
   */
   // TODO(dmaretskyi): Specify how the ids are generated.
   // TODO(dmaretskyi): For type dxns, should this include the version?
-  $id: Schema8.optional(Schema8.String),
+  $id: Schema7.optional(Schema7.String),
   /**
   * Schema of this schema.
   * Set to "https://json-schema.org/draft-07/schema".
   */
-  $schema: Schema8.optional(Schema8.String),
+  $schema: Schema7.optional(Schema7.String),
   /**
   * Reference to another schema.
   */
-  $ref: Schema8.optional(Schema8.String),
+  $ref: Schema7.optional(Schema7.String),
   /**
   * Comments are ignored when interpreting the schema.
   */
-  $comment: Schema8.optional(Schema8.String),
+  $comment: Schema7.optional(Schema7.String),
   /**
   * Defines whether this schema is an object schema or a relation schema.
   */
-  entityKind: Schema8.optional(EntityKindSchema),
+  entityKind: Schema7.optional(EntityKindSchema),
   /**
   * Typename of this schema.
   * Only on schema representing an ECHO object.
   *
   * @example 'example.com/type/MyType'
   */
-  typename: Schema8.optional(Schema8.String),
+  typename: Schema7.optional(Schema7.String),
   /**
   * Version of this schema.
   * Custom dialect for ECHO.
   */
-  version: Schema8.optional(Schema8.String),
+  version: Schema7.optional(Schema7.String),
   /**
   * Target of this relation.
   * Only for relation schemas.
   * The referenced schema must be an object schema.
   */
-  relationTarget: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
+  relationTarget: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
   /**
   * Source of this relation.
   * Only for relation schemas.
   * The referenced schema must be an object schema.
   */
-  relationSource: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
+  relationSource: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
   /**
   * Title of this schema.
   */
-  title: Schema8.optional(Schema8.String),
+  title: Schema7.optional(Schema7.String),
   /**
   * Description of this schema.
   */
-  description: Schema8.optional(Schema8.String),
+  description: Schema7.optional(Schema7.String),
   /**
   * Whether this schema is read-only.
   */
-  readOnly: Schema8.optional(Schema8.Boolean),
+  readOnly: Schema7.optional(Schema7.Boolean),
   /**
   * Whether this schema is write-only.
   */
-  writeOnly: Schema8.optional(Schema8.Boolean),
+  writeOnly: Schema7.optional(Schema7.Boolean),
   /**
   * Examples of instances of this schema.
   */
-  examples: Schema8.optional(Schema8.Array(Schema8.Any)),
+  examples: Schema7.optional(Schema7.Array(Schema7.Any)),
   /**
   * Default value for this schema.
   */
-  default: Schema8.optional(Schema8.Any),
+  default: Schema7.optional(Schema7.Any),
   /**
   * This schema only matches values that are equal to this value.
   */
-  const: Schema8.optional(Schema8.Any),
+  const: Schema7.optional(Schema7.Any),
   /**
   * This schema only matches one of the values in this array.
   */
-  enum: Schema8.optional(Schema8.Array(Schema8.Any)),
+  enum: Schema7.optional(Schema7.Array(Schema7.Any)),
   /**
   * Base type of the schema.
   */
-  type: Schema8.optional(Schema8.Union(SimpleTypes, Schema8.Array(SimpleTypes))),
+  type: Schema7.optional(Schema7.Union(SimpleTypes, Schema7.Array(SimpleTypes))),
   //
   // Numbers.
   //
-  multipleOf: Schema8.optional(Schema8.Number.pipe(Schema8.greaterThan(0))),
-  maximum: Schema8.optional(Schema8.Number),
-  exclusiveMaximum: Schema8.optional(Schema8.Number),
-  minimum: Schema8.optional(Schema8.Number),
-  exclusiveMinimum: Schema8.optional(Schema8.Number),
+  multipleOf: Schema7.optional(Schema7.Number.pipe(Schema7.greaterThan(0))),
+  maximum: Schema7.optional(Schema7.Number),
+  exclusiveMaximum: Schema7.optional(Schema7.Number),
+  minimum: Schema7.optional(Schema7.Number),
+  exclusiveMinimum: Schema7.optional(Schema7.Number),
   //
   // Strings.
   //
-  maxLength: Schema8.optional(NonNegativeInteger),
+  maxLength: Schema7.optional(NonNegativeInteger),
   /**
   * Regex pattern for strings.
   */
-  pattern: Schema8.optional(Schema8.String.pipe(FormatAnnotation.set(TypeFormat.Regex))),
+  pattern: Schema7.optional(Schema7.String.pipe(FormatAnnotation.set(TypeFormat.Regex))),
   /**
   * Serialized from {@link FormatAnnotationId}.
   */
-  format: Schema8.optional(Schema8.String),
+  format: Schema7.optional(Schema7.String),
   //
   // Arrays
   //
-  minLength: Schema8.optional(NonNegativeInteger),
-  items: Schema8.optional(Schema8.Union(Schema8.suspend(() => JsonSchemaType), Schema8.Array(Schema8.suspend(() => JsonSchemaType)))),
-  additionalItems: Schema8.optional(Schema8.Union(Schema8.suspend(() => JsonSchemaType), Schema8.Boolean)),
-  maxItems: Schema8.optional(NonNegativeInteger),
-  minItems: Schema8.optional(NonNegativeInteger),
-  uniqueItems: Schema8.optional(Schema8.Boolean),
-  contains: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
+  minLength: Schema7.optional(NonNegativeInteger),
+  items: Schema7.optional(Schema7.Union(Schema7.suspend(() => JsonSchemaType), Schema7.Array(Schema7.suspend(() => JsonSchemaType)))),
+  additionalItems: Schema7.optional(Schema7.Union(Schema7.suspend(() => JsonSchemaType), Schema7.Boolean)),
+  maxItems: Schema7.optional(NonNegativeInteger),
+  minItems: Schema7.optional(NonNegativeInteger),
+  uniqueItems: Schema7.optional(Schema7.Boolean),
+  contains: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
   //
   // Objects
   //
-  maxProperties: Schema8.optional(NonNegativeInteger),
-  minProperties: Schema8.optional(NonNegativeInteger),
-  required: Schema8.optional(StringArray),
+  maxProperties: Schema7.optional(NonNegativeInteger),
+  minProperties: Schema7.optional(NonNegativeInteger),
+  required: Schema7.optional(StringArray),
   /**
   * Non-standard JSON Schema extension.
   * Defines the order of properties in the object.
@@ -588,71 +743,71 @@ var _JsonSchemaType = Schema8.Struct({
   *
   * Related: https://github.com/json-schema/json-schema/issues/119
   */
-  propertyOrder: Schema8.optional(StringArray),
-  additionalProperties: Schema8.optional(JsonSchemaOrBoolean),
-  properties: Schema8.optional(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.suspend(() => JsonSchemaType)
-  }).pipe(Schema8.mutable)),
-  patternProperties: Schema8.optional(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.suspend(() => JsonSchemaType)
-  }).pipe(Schema8.mutable)),
-  propertyNames: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
-  definitions: Schema8.optional(Schema8.mutable(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.suspend(() => JsonSchemaType)
-  }))),
-  dependencies: Schema8.optional(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.suspend(() => Schema8.Union(Schema8.String, StringArray, JsonSchemaType)).annotations({
+  propertyOrder: Schema7.optional(StringArray),
+  additionalProperties: Schema7.optional(JsonSchemaOrBoolean),
+  properties: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.suspend(() => JsonSchemaType)
+  })),
+  patternProperties: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.suspend(() => JsonSchemaType)
+  })),
+  propertyNames: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
+  definitions: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.suspend(() => JsonSchemaType)
+  })),
+  dependencies: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.suspend(() => Schema7.Union(Schema7.String, StringArray, JsonSchemaType)).annotations({
       identifier: "dependency",
       description: "Dependency"
     })
   })),
-  contentMediaType: Schema8.optional(Schema8.String),
-  contentEncoding: Schema8.optional(Schema8.String),
-  if: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
-  then: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
-  else: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
-  allOf: Schema8.optional(Schema8.Array(Schema8.suspend(() => JsonSchemaType))),
-  anyOf: Schema8.optional(Schema8.Array(Schema8.suspend(() => JsonSchemaType))),
-  oneOf: Schema8.optional(Schema8.Array(Schema8.suspend(() => JsonSchemaType))),
-  not: Schema8.optional(Schema8.suspend(() => JsonSchemaType)),
-  $defs: Schema8.optional(Schema8.mutable(Schema8.Record({
-    key: Schema8.String,
-    value: Schema8.suspend(() => JsonSchemaType)
-  }))),
+  contentMediaType: Schema7.optional(Schema7.String),
+  contentEncoding: Schema7.optional(Schema7.String),
+  if: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
+  then: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
+  else: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
+  allOf: Schema7.optional(Schema7.Array(Schema7.suspend(() => JsonSchemaType))),
+  anyOf: Schema7.optional(Schema7.Array(Schema7.suspend(() => JsonSchemaType))),
+  oneOf: Schema7.optional(Schema7.Array(Schema7.suspend(() => JsonSchemaType))),
+  not: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
+  $defs: Schema7.optional(Schema7.Record({
+    key: Schema7.String,
+    value: Schema7.suspend(() => JsonSchemaType)
+  })),
   //
   // ECHO extensions.
   //
-  currency: Schema8.optional(Schema8.String),
-  reference: Schema8.optional(Schema8.mutable(Schema8.Struct({
-    schema: Schema8.suspend(() => JsonSchemaType),
-    schemaVersion: Schema8.optional(Schema8.String),
-    schemaObject: Schema8.optional(Schema8.String)
-  }))),
+  currency: Schema7.optional(Schema7.String),
+  reference: Schema7.optional(Schema7.Struct({
+    schema: Schema7.suspend(() => JsonSchemaType),
+    schemaVersion: Schema7.optional(Schema7.String),
+    schemaObject: Schema7.optional(Schema7.String)
+  })),
   /**
   * ECHO-specific annotations.
   */
   // TODO(dmaretskyi): Since we are adding a lot of new extensions to the JSON Schema, it is safer to namespace them here.
-  annotations: Schema8.optional(Schema8.mutable(JsonSchemaEchoAnnotations)),
+  annotations: Schema7.optional(JsonSchemaEchoAnnotations),
   /**
   * @deprecated Use `annotations` instead.
   */
-  echo: Schema8.optional(Schema8.mutable(JsonSchemaEchoAnnotations))
+  echo: Schema7.optional(JsonSchemaEchoAnnotations)
 }).annotations({
   identifier: "jsonSchema",
   description: "JSON Schema"
 });
 var JsonSchemaFields = Object.keys(_JsonSchemaType.fields);
-var JsonSchemaType = _JsonSchemaType.pipe(Schema8.mutable);
+var JsonSchemaType = _JsonSchemaType;
 var getSchemaProperty = (schema, property) => {
   return schema.properties?.[property];
 };
-var setSchemaProperty = (schema, property, value) => {
+var setSchemaProperty = (schema, property, value2) => {
   schema.properties ??= {};
-  schema.properties[property] = value;
+  schema.properties[property] = value2;
   return schema;
 };
 var ECHO_ANNOTATIONS_NS_DEPRECATED_KEY = "echo";
@@ -763,13 +918,13 @@ var go = (schema) => {
     go(schema.reference.schema);
   }
 };
-var maybeGoOnArray = (value) => {
-  if (Array.isArray(value)) {
-    for (const item of value) {
+var maybeGoOnArray = (value2) => {
+  if (Array.isArray(value2)) {
+    for (const item of value2) {
       go(item);
     }
-  } else if (typeof value === "object" && value !== null) {
-    go(value);
+  } else if (typeof value2 === "object" && value2 !== null) {
+    go(value2);
   }
 };
 var goOnRecord = (record) => {
@@ -783,26 +938,30 @@ import * as Array4 from "effect/Array";
 import * as Function from "effect/Function";
 import * as JSONSchema from "effect/JSONSchema";
 import * as Option2 from "effect/Option";
-import * as Schema10 from "effect/Schema";
+import * as Schema9 from "effect/Schema";
 import * as SchemaAST6 from "effect/SchemaAST";
 import { raise as raise2 } from "@dxos/debug";
 import { mapAst } from "@dxos/effect";
-import { assertArgument as assertArgument4, invariant as invariant7 } from "@dxos/invariant";
+import { assertArgument as assertArgument6, invariant as invariant9 } from "@dxos/invariant";
 import { DXN as DXN5, ObjectId as ObjectId4 } from "@dxos/keys";
 import { log } from "@dxos/log";
 import { clearUndefined, orderKeys, removeProperties } from "@dxos/util";
 
 // src/internal/ref/ref.ts
 import * as Effect from "effect/Effect";
+import * as Equal from "effect/Equal";
+import * as Hash from "effect/Hash";
 import * as Option from "effect/Option";
 import * as ParseResult from "effect/ParseResult";
-import * as Schema9 from "effect/Schema";
+import * as Pipeable from "effect/Pipeable";
+import * as Schema8 from "effect/Schema";
 import * as SchemaAST5 from "effect/SchemaAST";
-import { Reference } from "@dxos/echo-protocol";
-import { compositeRuntime } from "@dxos/echo-signals/runtime";
-import { assertArgument as assertArgument3, invariant as invariant6 } from "@dxos/invariant";
+import { Event } from "@dxos/async";
+import { inspectCustom } from "@dxos/debug";
+import { EncodedReference } from "@dxos/echo-protocol";
+import { assertArgument as assertArgument5, invariant as invariant8 } from "@dxos/invariant";
 import { DXN as DXN4, ObjectId as ObjectId3 } from "@dxos/keys";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/ref/ref.ts";
+var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/ref/ref.ts";
 var JSON_SCHEMA_ECHO_REF_ID = "/schemas/echo/ref";
 var getSchemaReference = (property) => {
   const { $id, reference: { schema: { $ref } = {} } = {} } = property;
@@ -833,12 +992,12 @@ var getReferenceAst = (ast) => {
 };
 var RefTypeId = Symbol("@dxos/echo/internal/Ref");
 var Ref = (schema) => {
-  assertArgument3(Schema9.isSchema(schema), "schema", "Must call with an instance of effect-schema");
+  assertArgument5(Schema8.isSchema(schema), "schema", "Must call with an instance of effect-schema");
   const annotation = getTypeAnnotation(schema);
   if (annotation == null) {
     throw new Error("Reference target must be an ECHO schema.");
   }
-  return createEchoReferenceSchema(getTypeIdentifierAnnotation(schema), annotation.typename, annotation.version, getSchemaExpectedName(schema.ast));
+  return createEchoReferenceSchema(getTypeIdentifierAnnotation(schema), annotation.typename, annotation.version);
 };
 Ref.isRef = (obj) => {
   return obj && typeof obj === "object" && RefTypeId in obj;
@@ -855,23 +1014,23 @@ Ref.make = (obj) => {
     throw new TypeError("Expected: ECHO object.");
   }
   const id = obj.id;
-  invariant6(ObjectId3.isValid(id), "Invalid object ID", {
-    F: __dxlog_file6,
-    L: 221,
+  invariant8(ObjectId3.isValid(id), "Invalid object ID", {
+    F: __dxlog_file8,
+    L: 225,
     S: void 0,
     A: [
       "ObjectId.isValid(id)",
       "'Invalid object ID'"
     ]
   });
-  const dxn = Reference.localObjectReference(id).toDXN();
+  const dxn = DXN4.fromLocalObjectId(id);
   return new RefImpl(dxn, obj);
 };
 Ref.fromDXN = (dxn) => {
-  assertArgument3(dxn instanceof DXN4, "dxn", "Expected DXN");
+  assertArgument5(dxn instanceof DXN4, "dxn", "Expected DXN");
   return new RefImpl(dxn);
 };
-var createEchoReferenceSchema = (echoId, typename, version, schemaName) => {
+var createEchoReferenceSchema = (echoId, typename, version2) => {
   if (!echoId && !typename) {
     throw new TypeError("Either echoId or typename must be provided.");
   }
@@ -880,26 +1039,38 @@ var createEchoReferenceSchema = (echoId, typename, version, schemaName) => {
       // TODO(dmaretskyi): Include version?
       $ref: echoId ?? DXN4.fromTypename(typename).toString()
     },
-    schemaVersion: version
+    schemaVersion: version2
   };
-  const refSchema = Schema9.declare([], {
+  const refSchema = Schema8.declare([], {
     encode: () => {
-      return (value) => {
-        return Effect.succeed({
-          "/": value.dxn.toString()
-        });
-      };
+      return (value2) => Effect.gen(function* () {
+        if (Ref.isRef(value2)) {
+          return EncodedReference.fromDXN(value2.dxn);
+        } else if (EncodedReference.isEncodedReference(value2)) {
+          return value2;
+        }
+        throw new Error("Invalid reference");
+      });
     },
     decode: () => {
-      return (value) => {
-        if (Ref.isRef(value)) {
-          return Effect.succeed(value);
+      return (value2) => Effect.gen(function* () {
+        const dbService = yield* Effect.serviceOption(Service);
+        if (Ref.isRef(value2)) {
+          if (Option.isSome(dbService)) {
+            return dbService.value.db.makeRef(value2.dxn);
+          } else {
+            return value2;
+          }
         }
-        if (typeof value !== "object" || value == null || typeof value["/"] !== "string") {
-          return Effect.fail(new ParseResult.Unexpected(value, "reference"));
+        if (!EncodedReference.isEncodedReference(value2)) {
+          return yield* Effect.fail(new ParseResult.Unexpected(value2, "reference"));
         }
-        return Effect.succeed(Ref.fromDXN(DXN4.parse(value["/"])));
-      };
+        if (Option.isSome(dbService)) {
+          return dbService.value.db.makeRef(EncodedReference.toDXN(value2));
+        } else {
+          return Ref.fromDXN(EncodedReference.toDXN(value2));
+        }
+      });
     }
   }, {
     jsonSchema: {
@@ -910,18 +1081,15 @@ var createEchoReferenceSchema = (echoId, typename, version, schemaName) => {
     },
     [ReferenceAnnotationId]: {
       typename: typename ?? "",
-      version
+      version: version2
     }
   });
   return refSchema;
 };
-var getSchemaExpectedName = (ast) => {
-  return SchemaAST5.getIdentifierAnnotation(ast).pipe(Option.orElse(() => SchemaAST5.getTitleAnnotation(ast)), Option.orElse(() => SchemaAST5.getDescriptionAnnotation(ast)), Option.getOrElse(() => void 0));
-};
 var RefImpl = class _RefImpl {
   #dxn;
   #resolver = void 0;
-  #signal = compositeRuntime.createSignal();
+  #resolved = new Event();
   /**
   * Target is set when the reference is created from a specific object.
   * In this case, the target might not be in the database.
@@ -931,7 +1099,7 @@ var RefImpl = class _RefImpl {
   * Callback to issue a reactive notification when object is resolved.
   */
   #resolverCallback = () => {
-    this.#signal.notifyWrite();
+    this.#resolved.emit();
   };
   constructor(dxn, target) {
     this.#dxn = dxn;
@@ -946,14 +1114,19 @@ var RefImpl = class _RefImpl {
   /**
   * @inheritdoc
   */
+  get isAvailable() {
+    return this.#target !== void 0 || this.#resolver !== void 0;
+  }
+  /**
+  * @inheritdoc
+  */
   get target() {
-    this.#signal.notifyRead();
     if (this.#target) {
       return this.#target;
     }
-    invariant6(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file6,
-      L: 370,
+    invariant8(this.#resolver, "Resolver is not set", {
+      F: __dxlog_file8,
+      L: 393,
       S: this,
       A: [
         "this.#resolver",
@@ -969,9 +1142,9 @@ var RefImpl = class _RefImpl {
     if (this.#target) {
       return this.#target;
     }
-    invariant6(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file6,
-      L: 381,
+    invariant8(this.#resolver, "Resolver is not set", {
+      F: __dxlog_file8,
+      L: 404,
       S: this,
       A: [
         "this.#resolver",
@@ -988,9 +1161,12 @@ var RefImpl = class _RefImpl {
   * @inheritdoc
   */
   async tryLoad() {
-    invariant6(this.#resolver, "Resolver is not set", {
-      F: __dxlog_file6,
-      L: 393,
+    if (this.#target) {
+      return this.#target;
+    }
+    invariant8(this.#resolver, "Resolver is not set", {
+      F: __dxlog_file8,
+      L: 419,
       S: this,
       A: [
         "this.#resolver",
@@ -1032,8 +1208,24 @@ var RefImpl = class _RefImpl {
     }
     return `Ref(${this.#dxn.toString()})`;
   }
+  [inspectCustom] = (depth, options, inspect) => {
+    return this.toString();
+  };
   [RefTypeId] = refVariance;
   /**
+  * Effect Hash trait. Required for MutableHashMap-based caches (e.g., Atom.family)
+  * to deduplicate Ref instances that point to the same object.
+  * ECHO proxies return new RefImpl instances on every property access,
+  * so without this, each access would create a separate cache entry.
+  */
+  [Hash.symbol]() {
+    return Hash.hash(this.#dxn.toString());
+  }
+  /** Effect Equal trait. See {@link Hash.symbol} for rationale. */
+  [Equal.symbol](that) {
+    return that instanceof _RefImpl && this.#dxn.toString() === that.dxn.toString();
+  }
+  /**
   * Internal method to set the resolver.
   *
   * @internal
@@ -1042,19 +1234,19 @@ var RefImpl = class _RefImpl {
     this.#resolver = resolver;
   }
   /**
-  * Internal method to get the saved target.
-  * Not the same as `target` which is resolved from the resolver.
-  *
   * @internal
   */
   _getSavedTarget() {
     return this.#target;
   }
+  pipe() {
+    return Pipeable.pipeArguments(this, arguments);
+  }
 };
 var setRefResolver = (ref, resolver) => {
-  invariant6(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
-    F: __dxlog_file6,
-    L: 459,
+  invariant8(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
+    F: __dxlog_file8,
+    L: 506,
     S: void 0,
     A: [
       "ref instanceof RefImpl",
@@ -1064,9 +1256,9 @@ var setRefResolver = (ref, resolver) => {
   ref._setResolver(resolver);
 };
 var getRefSavedTarget = (ref) => {
-  invariant6(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
-    F: __dxlog_file6,
-    L: 467,
+  invariant8(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
+    F: __dxlog_file8,
+    L: 514,
     S: void 0,
     A: [
       "ref instanceof RefImpl",
@@ -1095,9 +1287,9 @@ var StaticRefResolver = class {
   }
   addSchema(schema) {
     const dxn = getSchemaDXN(schema);
-    invariant6(dxn, "Schema has no DXN", {
-      F: __dxlog_file6,
-      L: 499,
+    invariant8(dxn, "Schema has no DXN", {
+      F: __dxlog_file8,
+      L: 546,
       S: this,
       A: [
         "dxn",
@@ -1153,7 +1345,7 @@ var RefArray = Object.freeze({
 });
 
 // src/internal/json-schema/json-schema.ts
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/json-schema/json-schema.ts";
+var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/json-schema/json-schema.ts";
 var PropType = /* @__PURE__ */ (function(PropType2) {
   PropType2[PropType2["NONE"] = 0] = "NONE";
   PropType2[PropType2["STRING"] = 1] = "STRING";
@@ -1185,17 +1377,17 @@ var toPropType = (type) => {
 };
 var JSON_SCHEMA_URL = "http://json-schema.org/draft-07/schema#";
 var toJsonSchema = (schema, options = {}) => {
-  assertArgument4(Schema10.isSchema(schema), "schema");
+  assertArgument6(Schema9.isSchema(schema), "schema");
   let jsonSchema = _toJsonSchemaAST(schema.ast);
   if (options.strict) {
-    jsonSchema = removeProperties(jsonSchema, (key, value) => {
-      if (key === "$id" && value === "/schemas/any") {
+    jsonSchema = removeProperties(jsonSchema, (key, value2) => {
+      if (key === "$id" && value2 === "/schemas/any") {
         return true;
       }
-      if (key === "$ref" && value === "#/$defs/dependency") {
+      if (key === "$ref" && value2 === "#/$defs/dependency") {
         return true;
       }
-      if (key === "$ref" && value === "#/$defs/jsonSchema") {
+      if (key === "$ref" && value2 === "#/$defs/jsonSchema") {
         return true;
       }
       return false;
@@ -1257,7 +1449,7 @@ var toEffectSchema = (root, _defs) => {
   if ("type" in root && root.type === "object") {
     return objectToEffectSchema(root, defs);
   }
-  let result = Schema10.Unknown;
+  let result = Schema9.Unknown;
   if ("$ref" in root) {
     switch (root.$ref) {
       case "/schemas/echo/ref": {
@@ -1272,12 +1464,12 @@ var toEffectSchema = (root, _defs) => {
         break;
       }
       case "/schemas/unknown": {
-        result = Schema10.Unknown;
+        result = Schema9.Unknown;
         break;
       }
       case "/schemas/{}":
       case "/schemas/object": {
-        result = Schema10.Object;
+        result = Schema9.Object;
         break;
       }
       // Custom ECHO object reference.
@@ -1287,52 +1479,52 @@ var toEffectSchema = (root, _defs) => {
       }
     }
   } else if ("enum" in root) {
-    result = Schema10.Union(...root.enum.map((e) => Schema10.Literal(e)));
+    result = Schema9.Union(...root.enum.map((e) => Schema9.Literal(e)));
   } else if ("oneOf" in root) {
-    result = Schema10.Union(...root.oneOf.map((v) => toEffectSchema(v, defs)));
+    result = Schema9.Union(...root.oneOf.map((v) => toEffectSchema(v, defs)));
   } else if ("anyOf" in root) {
-    result = Schema10.Union(...root.anyOf.map((v) => toEffectSchema(v, defs)));
+    result = Schema9.Union(...root.anyOf.map((v) => toEffectSchema(v, defs)));
   } else if ("allOf" in root) {
     if (root.allOf.length === 1) {
       result = toEffectSchema(root.allOf[0], defs);
     } else {
       log.warn("allOf with multiple schemas is not supported", void 0, {
-        F: __dxlog_file7,
-        L: 221,
+        F: __dxlog_file9,
+        L: 224,
         S: void 0,
         C: (f, a) => f(...a)
       });
-      result = Schema10.Unknown;
+      result = Schema9.Unknown;
     }
   } else if ("type" in root) {
     switch (root.type) {
       case "string": {
-        result = Schema10.String;
+        result = Schema9.String;
         if (root.pattern) {
-          result = result.pipe(Schema10.pattern(new RegExp(root.pattern)));
+          result = result.pipe(Schema9.pattern(new RegExp(root.pattern)));
         }
         break;
       }
       case "number": {
-        result = Schema10.Number;
+        result = Schema9.Number;
         break;
       }
       case "integer": {
-        result = Schema10.Number.pipe(Schema10.int());
+        result = Schema9.Number.pipe(Schema9.int());
         break;
       }
       case "boolean": {
-        result = Schema10.Boolean;
+        result = Schema9.Boolean;
         break;
       }
       case "array": {
         if (Array4.isArray(root.items)) {
           const [required, optional5] = Function.pipe(root.items, Array4.map((v) => toEffectSchema(v, defs)), Array4.splitAt(root.minItems ?? root.items.length));
-          result = Schema10.Tuple(...required, ...optional5.map(Schema10.optionalElement));
+          result = Schema9.Tuple(...required, ...optional5.map(Schema9.optionalElement));
         } else {
-          invariant7(root.items, void 0, {
-            F: __dxlog_file7,
-            L: 254,
+          invariant9(root.items, void 0, {
+            F: __dxlog_file9,
+            L: 257,
             S: void 0,
             A: [
               "root.items",
@@ -1340,28 +1532,28 @@ var toEffectSchema = (root, _defs) => {
             ]
           });
           const items = root.items;
-          result = Array4.isArray(items) ? Schema10.Tuple(...items.map((v) => toEffectSchema(v, defs))) : Schema10.Array(toEffectSchema(items, defs));
+          result = Array4.isArray(items) ? Schema9.Tuple(...items.map((v) => toEffectSchema(v, defs))) : Schema9.Array(toEffectSchema(items, defs));
         }
         break;
       }
       case "null": {
-        result = Schema10.Null;
+        result = Schema9.Null;
         break;
       }
     }
   } else if ("$ref" in root) {
     const refSegments = root.$ref.split("/");
     const jsonSchema = defs[refSegments[refSegments.length - 1]];
-    invariant7(jsonSchema, `missing definition for ${root.$ref}`, {
-      F: __dxlog_file7,
-      L: 270,
+    invariant9(jsonSchema, `missing definition for ${root.$ref}`, {
+      F: __dxlog_file9,
+      L: 273,
       S: void 0,
       A: [
         "jsonSchema",
         "`missing definition for ${root.$ref}`"
       ]
     });
-    result = toEffectSchema(jsonSchema, defs).pipe(Schema10.annotations({
+    result = toEffectSchema(jsonSchema, defs).pipe(Schema9.annotations({
       identifier: refSegments[refSegments.length - 1]
     }));
   }
@@ -1370,9 +1562,9 @@ var toEffectSchema = (root, _defs) => {
   return result;
 };
 var objectToEffectSchema = (root, defs) => {
-  invariant7("type" in root && root.type === "object", `not an object: ${root}`, {
-    F: __dxlog_file7,
-    L: 285,
+  invariant9("type" in root && root.type === "object", `not an object: ${root}`, {
+    F: __dxlog_file9,
+    L: 288,
     S: void 0,
     A: [
       "'type' in root && root.type === 'object'",
@@ -1384,11 +1576,11 @@ var objectToEffectSchema = (root, defs) => {
   let fields = {};
   const propertyList = Object.entries(root.properties ?? {});
   let immutableIdField;
-  for (const [key, value] of propertyList) {
+  for (const [key, value2] of propertyList) {
     if (isEchoObject && key === "id") {
-      immutableIdField = toEffectSchema(value, defs);
+      immutableIdField = toEffectSchema(value2, defs);
     } else {
-      fields[key] = root.required?.includes(key) ? toEffectSchema(value, defs) : Schema10.optional(toEffectSchema(value, defs));
+      fields[key] = root.required?.includes(key) ? toEffectSchema(value2, defs) : Schema9.optional(toEffectSchema(value2, defs));
     }
   }
   if (root.propertyOrder) {
@@ -1396,46 +1588,46 @@ var objectToEffectSchema = (root, defs) => {
   }
   let schema;
   if (root.patternProperties) {
-    invariant7(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", {
-      F: __dxlog_file7,
-      L: 311,
+    invariant9(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", {
+      F: __dxlog_file9,
+      L: 314,
       S: void 0,
       A: [
         "propertyList.length === 0",
         "'pattern properties mixed with regular properties are not supported'"
       ]
     });
-    invariant7(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", {
-      F: __dxlog_file7,
-      L: 312,
+    invariant9(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", {
+      F: __dxlog_file9,
+      L: 315,
       S: void 0,
       A: [
         "Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''",
         "'only one pattern property is supported'"
       ]
     });
-    schema = Schema10.Record({
-      key: Schema10.String,
+    schema = Schema9.Record({
+      key: Schema9.String,
       value: toEffectSchema(root.patternProperties[""], defs)
     });
   } else if (typeof root.additionalProperties !== "object") {
-    schema = Schema10.Struct(fields);
+    schema = Schema9.Struct(fields);
   } else {
     const indexValue = toEffectSchema(root.additionalProperties, defs);
     if (propertyList.length > 0) {
-      schema = Schema10.Struct(fields, {
-        key: Schema10.String,
+      schema = Schema9.Struct(fields, {
+        key: Schema9.String,
         value: indexValue
       });
     } else {
-      schema = Schema10.Record({
-        key: Schema10.String,
+      schema = Schema9.Record({
+        key: Schema9.String,
         value: indexValue
       });
     }
   }
   if (immutableIdField) {
-    schema = Schema10.extend(Schema10.mutable(schema), Schema10.Struct({
+    schema = Schema9.extend(schema, Schema9.Struct({
       id: immutableIdField
     }));
   }
@@ -1448,20 +1640,20 @@ var anyToEffectSchema = (root) => {
     const echoId = root.$id.startsWith("dxn:echo:") ? root.$id : void 0;
     return createEchoReferenceSchema(echoId, echoRefinement.reference.typename, echoRefinement.reference.version);
   }
-  return Schema10.Any;
+  return Schema9.Any;
 };
 var refToEffectSchema = (root) => {
   if (!("reference" in root)) {
-    return Ref(Expando);
+    return createEchoReferenceSchema(void 0, ANY_OBJECT_TYPENAME, ANY_OBJECT_VERSION);
   }
   const reference = root.reference;
   if (typeof reference !== "object") {
     throw new Error("Invalid reference field in ref schema");
   }
   const targetSchemaDXN = DXN5.parse(reference.schema.$ref);
-  invariant7(targetSchemaDXN.kind === DXN5.kind.TYPE, void 0, {
-    F: __dxlog_file7,
-    L: 364,
+  invariant9(targetSchemaDXN.kind === DXN5.kind.TYPE, void 0, {
+    F: __dxlog_file9,
+    L: 368,
     S: void 0,
     A: [
       "targetSchemaDXN.kind === DXN.kind.TYPE",
@@ -1487,9 +1679,9 @@ var annotations_toJsonSchemaFields = (annotations4) => {
     schemaFields[ECHO_ANNOTATIONS_NS_KEY].schemaId = echoIdentifier;
   }
   for (const [key, annotationId] of Object.entries(CustomAnnotations)) {
-    const value = annotations4[annotationId];
-    if (value != null) {
-      schemaFields[key] = value;
+    const value2 = annotations4[annotationId];
+    if (value2 != null) {
+      schemaFields[key] = value2;
     }
   }
   return schemaFields;
@@ -1509,7 +1701,7 @@ var decodeTypeAnnotation = (schema) => {
   if (schema.typename) {
     const annotation = {
       // TODO(dmaretskyi): Decoding default.
-      kind: schema.entityKind ? Schema10.decodeSync(EntityKindSchema)(schema.entityKind) : EntityKind.Object,
+      kind: schema.entityKind ? Schema9.decodeSync(EntityKindSchema)(schema.entityKind) : EntityKind.Object,
       typename: schema.typename,
       version: schema.version ?? "0.1.0"
     };
@@ -1597,15 +1789,15 @@ var normalizeJsonSchema = (jsonSchema) => {
 };
 
 // src/internal/object/common.ts
-import * as Schema11 from "effect/Schema";
-var makeTypedEntityClass = (typename, version, baseSchema) => {
+import * as Schema10 from "effect/Schema";
+var makeTypedEntityClass = (typename, version2, baseSchema) => {
   return class {
     // Implement TypedObject properties.
     static typename = typename;
-    static version = version;
+    static version = version2;
     // Implement Schema.Schema properties.
     // TODO(burdon): Comment required.
-    static [Schema11.TypeId] = schemaVariance;
+    static [Schema10.TypeId] = schemaVariance;
     static ast = baseSchema.ast;
     static annotations = baseSchema.annotations.bind(baseSchema);
     static pipe = baseSchema.pipe.bind(baseSchema);
@@ -1627,202 +1819,117 @@ var schemaVariance = {
 
 // src/internal/object/create-object.ts
 import { raise as raise4 } from "@dxos/debug";
-import { assertArgument as assertArgument6, failedInvariant } from "@dxos/invariant";
-import { ObjectId as ObjectId6 } from "@dxos/keys";
-import { defineHiddenProperty as defineHiddenProperty2 } from "@dxos/live-object";
+import { assertArgument as assertArgument8, failedInvariant } from "@dxos/invariant";
+import { ObjectId as ObjectId7 } from "@dxos/keys";
 
-// src/internal/object/inspect.ts
-import { inspectCustom } from "@dxos/debug";
-var attachedTypedObjectInspector = (obj) => {
-  const descriptor = Object.getOwnPropertyDescriptor(obj, inspectCustom);
-  if (descriptor) {
-    return;
+// src/internal/proxy/symbols.ts
+var EventId = Symbol.for("@dxos/live-object/EventId");
+var ChangeId = Symbol.for("@dxos/live-object/ChangeId");
+
+// src/internal/proxy/event-batch.ts
+var eventBatchDepth = 0;
+var pendingEventTargets = /* @__PURE__ */ new Set();
+var batchEvents = (callback) => {
+  eventBatchDepth++;
+  try {
+    callback();
+  } finally {
+    eventBatchDepth--;
+    if (eventBatchDepth === 0) {
+      for (const target of pendingEventTargets) {
+        target[EventId]?.emit();
+      }
+      pendingEventTargets.clear();
+    }
   }
-  Object.defineProperty(obj, inspectCustom, {
-    value: typedObjectInspectFunction,
-    writable: false,
-    enumerable: false,
-    configurable: true
-  });
 };
-var typedObjectInspectFunction = function(depth, options, inspect) {
-  const { id, ...props } = this;
-  return inspect({
-    id,
-    [ATTR_TYPE]: getTypeDXN(this),
-    ...props,
-    [ATTR_META]: this[MetaId]
-  }, options);
+var emitEvent = (target) => {
+  if (eventBatchDepth > 0) {
+    pendingEventTargets.add(target);
+  } else {
+    target[EventId]?.emit();
+  }
 };
 
-// src/internal/object/json-serializer.ts
-import * as Schema12 from "effect/Schema";
-import { raise as raise3 } from "@dxos/debug";
-import { isEncodedReference } from "@dxos/echo-protocol";
-import { assertArgument as assertArgument5, invariant as invariant8 } from "@dxos/invariant";
-import { DXN as DXN6, ObjectId as ObjectId5 } from "@dxos/keys";
-import { defineHiddenProperty } from "@dxos/live-object";
-import { assumeType as assumeType3, deepMapValues, visitValues } from "@dxos/util";
-var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/json-serializer.ts";
-var objectToJSON = (obj) => {
-  const typename = getTypeDXN(obj)?.toString();
-  invariant8(typename && typeof typename === "string", void 0, {
-    F: __dxlog_file8,
-    L: 59,
-    S: void 0,
-    A: [
-      "typename && typeof typename === 'string'",
-      ""
-    ]
-  });
-  return typedJsonSerializer.call(obj);
+// src/internal/proxy/change-context.ts
+var currentChangeContext = null;
+var pendingNotificationKey = null;
+var pendingOwnerNotifications = /* @__PURE__ */ new Set();
+var enterChangeContext = (key) => {
+  currentChangeContext = key;
+  return () => {
+    currentChangeContext = null;
+  };
 };
-var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
-  assumeType3(jsonData);
-  assertArgument5(typeof jsonData === "object" && jsonData !== null, "jsonData", "expect object");
-  assertArgument5(typeof jsonData[ATTR_TYPE] === "string", "jsonData[ATTR_TYPE]", "expected object to have a type");
-  assertArgument5(typeof jsonData.id === "string", "jsonData.id", "expected object to have an id");
-  const type = DXN6.parse(jsonData[ATTR_TYPE]);
-  const schema = await refResolver?.resolveSchema(type);
-  invariant8(schema === void 0 || Schema12.isSchema(schema), void 0, {
-    F: __dxlog_file8,
-    L: 80,
-    S: void 0,
-    A: [
-      "schema === undefined || Schema.isSchema(schema)",
-      ""
-    ]
-  });
-  let obj;
-  if (schema != null) {
-    obj = await schema.pipe(Schema12.decodeUnknownPromise)(jsonData);
-    if (refResolver) {
-      setRefResolverOnData(obj, refResolver);
-    }
-  } else {
-    obj = decodeGeneric(jsonData, {
-      refResolver
-    });
-  }
-  invariant8(ObjectId5.isValid(obj.id), "Invalid object id", {
-    F: __dxlog_file8,
-    L: 92,
-    S: void 0,
-    A: [
-      "ObjectId.isValid(obj.id)",
-      "'Invalid object id'"
-    ]
-  });
-  setTypename(obj, type);
-  if (schema) {
-    setSchema(obj, schema);
-  }
-  const isRelation = typeof jsonData[ATTR_RELATION_SOURCE] === "string" || typeof jsonData[ATTR_RELATION_TARGET] === "string";
-  if (isRelation) {
-    const sourceDxn = DXN6.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise3(new TypeError("Missing relation source")));
-    const targetDxn = DXN6.parse(jsonData[ATTR_RELATION_TARGET] ?? raise3(new TypeError("Missing relation target")));
-    const source = await refResolver?.resolve(sourceDxn);
-    const target = await refResolver?.resolve(targetDxn);
-    defineHiddenProperty(obj, KindId, EntityKind.Relation);
-    defineHiddenProperty(obj, RelationSourceDXNId, sourceDxn);
-    defineHiddenProperty(obj, RelationTargetDXNId, targetDxn);
-    defineHiddenProperty(obj, RelationSourceId, source);
-    defineHiddenProperty(obj, RelationTargetId, target);
-  } else {
-    defineHiddenProperty(obj, KindId, EntityKind.Object);
+var isInChangeContext = (key) => {
+  return currentChangeContext === key;
+};
+var queueNotification = (key) => {
+  if (currentChangeContext === key) {
+    pendingNotificationKey = key;
   }
-  if (typeof jsonData[ATTR_META] === "object") {
-    const meta = await ObjectMetaSchema.pipe(Schema12.decodeUnknownPromise)(jsonData[ATTR_META]);
-    invariant8(Array.isArray(meta.keys), void 0, {
-      F: __dxlog_file8,
-      L: 118,
-      S: void 0,
-      A: [
-        "Array.isArray(meta.keys)",
-        ""
-      ]
-    });
-    defineHiddenProperty(obj, MetaId, meta);
+};
+var queueOwnerNotification = (target) => {
+  if (currentChangeContext !== null && target !== currentChangeContext) {
+    pendingOwnerNotifications.add(target);
   }
-  if (dxn) {
-    defineHiddenProperty(obj, SelfDXNId, dxn);
+};
+var hasPendingNotifications = (key) => {
+  return pendingNotificationKey === key;
+};
+var clearPendingNotifications = (key) => {
+  if (pendingNotificationKey === key) {
+    pendingNotificationKey = null;
   }
-  assertObjectModel(obj);
-  invariant8(obj[ATTR_TYPE] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 127,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_TYPE] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant8(obj[ATTR_META] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 128,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_META] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant8(obj[ATTR_DELETED] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 129,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_DELETED] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant8(obj[ATTR_SELF_DXN] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 130,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_SELF_DXN] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant8(obj[ATTR_RELATION_SOURCE] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 131,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_RELATION_SOURCE] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant8(obj[ATTR_RELATION_TARGET] === void 0, "Invalid object model", {
-    F: __dxlog_file8,
-    L: 132,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_RELATION_TARGET] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  return obj;
 };
-var decodeGeneric = (jsonData, options) => {
-  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDxn, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
-  return deepMapValues(props, (value, visitor) => {
-    if (isEncodedReference(value)) {
-      return refFromEncodedReference(value, options.refResolver);
+var executeChange = (contextKey, eventTarget, proxy, callback) => {
+  const exitContext = enterChangeContext(contextKey);
+  try {
+    batchEvents(() => callback(proxy));
+  } finally {
+    exitContext();
+    if (hasPendingNotifications(contextKey)) {
+      clearPendingNotifications(contextKey);
+      eventTarget[EventId]?.emit();
     }
-    return visitor(value);
+    for (const ownerTarget of pendingOwnerNotifications) {
+      ownerTarget[EventId]?.emit();
+    }
+    pendingOwnerNotifications.clear();
+  }
+};
+
+// src/internal/proxy/define-hidden-property.ts
+var defineHiddenProperty = (object, key, value2) => {
+  Object.defineProperty(object, key, {
+    enumerable: false,
+    configurable: true,
+    value: value2
   });
 };
-var setRefResolverOnData = (obj, refResolver) => {
-  const visitor = (value) => {
-    if (Ref.isRef(value)) {
-      setRefResolver(value, refResolver);
-    } else {
-      visitValues(value, visitor);
-    }
-  };
-  visitor(obj);
+
+// src/internal/proxy/errors.ts
+var MutationOutsideChangeContextError = class extends Error {
+  constructor(operation, suggestion) {
+    super(`Cannot ${operation} outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { ${suggestion} }) instead.`);
+    this.name = "MutationOutsideChangeContextError";
+  }
+};
+var createPropertySetError = (prop) => {
+  return new MutationOutsideChangeContextError(`modify object property "${String(prop)}"`, `mutableObj.${String(prop)} = value;`);
+};
+var createPropertyDeleteError = (prop) => {
+  return new MutationOutsideChangeContextError(`delete object property "${String(prop)}"`, `delete mutableObj.${String(prop)};`);
 };
+var createArrayMethodError = (method) => {
+  return new MutationOutsideChangeContextError(`call array.${method}()`, `mutableObj.array.${method}(...);`);
+};
+
+// src/internal/proxy/json-serializer.ts
+import { invariant as invariant10 } from "@dxos/invariant";
+import { DXN as DXN6 } from "@dxos/keys";
+import { deepMapValues } from "@dxos/util";
+var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/json-serializer.ts";
 var attachTypedJsonSerializer = (obj) => {
   const descriptor = Object.getOwnPropertyDescriptor(obj, "toJSON");
   if (descriptor) {
@@ -1852,9 +1959,9 @@ var typedJsonSerializer = function() {
   }
   if (this[RelationSourceDXNId]) {
     const sourceDXN = this[RelationSourceDXNId];
-    invariant8(sourceDXN instanceof DXN6, void 0, {
-      F: __dxlog_file8,
-      L: 204,
+    invariant10(sourceDXN instanceof DXN6, void 0, {
+      F: __dxlog_file10,
+      L: 61,
       S: this,
       A: [
         "sourceDXN instanceof DXN",
@@ -1865,9 +1972,9 @@ var typedJsonSerializer = function() {
   }
   if (this[RelationTargetDXNId]) {
     const targetDXN = this[RelationTargetDXNId];
-    invariant8(targetDXN instanceof DXN6, void 0, {
-      F: __dxlog_file8,
-      L: 209,
+    invariant10(targetDXN instanceof DXN6, void 0, {
+      F: __dxlog_file10,
+      L: 66,
       S: this,
       A: [
         "targetDXN instanceof DXN",
@@ -1880,142 +1987,398 @@ var typedJsonSerializer = function() {
   return result;
 };
 var serializeData = (data) => {
-  return deepMapValues(data, (value, recurse) => {
-    if (Ref.isRef(value)) {
-      return value.noInline().encode();
+  return deepMapValues(data, (value2, recurse) => {
+    if (Ref.isRef(value2)) {
+      return value2.noInline().encode();
     }
-    return recurse(value);
+    return recurse(value2);
   });
 };
 var serializeMeta = (meta) => {
-  return deepMapValues(meta, (value, recurse) => recurse(value));
+  return deepMapValues(meta, (value2, recurse) => recurse(value2));
 };
 
-// src/internal/object/create-object.ts
-var createObject = (schema, props) => {
-  const annotation = getTypeAnnotation(schema);
-  if (!annotation) {
-    throw new Error("Schema is not an ECHO schema");
+// src/internal/proxy/make-object.ts
+import { ObjectId as ObjectId5 } from "@dxos/keys";
+
+// src/internal/proxy/proxy-utils.ts
+import { invariant as invariant11 } from "@dxos/invariant";
+var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/proxy-utils.ts";
+var symbolIsProxy = Symbol.for("@dxos/schema/Proxy");
+var isProxy = (value2) => !!value2?.[symbolIsProxy];
+var isValidProxyTarget = (value2) => {
+  if (value2 == null || value2[symbolIsProxy]) {
+    return false;
   }
-  assertArgument6(!("@type" in props), "data", "@type is not allowed");
-  assertArgument6(!(RelationSourceDXNId in props), "data", "Relation source DXN is not allowed in the constructor");
-  assertArgument6(!(RelationTargetDXNId in props), "data", "Relation target DXN is not allowed in the constructor");
-  assertArgument6(RelationSourceId in props === RelationTargetId in props, "data", "Relation source and target must be provided together");
-  const obj = {
-    ...props,
-    id: props.id ?? ObjectId6.random()
-  };
-  const kind = RelationSourceId in props ? EntityKind.Relation : EntityKind.Object;
-  defineHiddenProperty2(obj, KindId, kind);
-  defineHiddenProperty2(obj, MetaId, {
-    keys: []
-  });
-  setSchema(obj, schema);
-  setTypename(obj, getSchemaDXN(schema) ?? failedInvariant("Missing schema DXN"));
-  attachTypedJsonSerializer(obj);
-  attachedTypedObjectInspector(obj);
-  if (kind === EntityKind.Relation) {
-    const sourceDXN = getObjectDXN(props[RelationSourceId]) ?? raise4(new Error("Unresolved relation source"));
-    const targetDXN = getObjectDXN(props[RelationTargetId]) ?? raise4(new Error("Unresolved relation target"));
-    defineHiddenProperty2(obj, RelationSourceDXNId, sourceDXN);
-    defineHiddenProperty2(obj, RelationTargetDXNId, targetDXN);
+  if (Array.isArray(value2)) {
+    return true;
   }
-  assertObjectModel(obj);
-  return obj;
+  return typeof value2 === "object" && Object.getPrototypeOf(value2) === Object.prototype;
 };
-
-// src/internal/object/deleted.ts
-var isDeleted = (obj) => {
-  if (obj[ObjectDeletedId] === void 0) {
-    return false;
+var getProxySlot = (proxy) => {
+  const value2 = proxy[symbolIsProxy];
+  invariant11(value2 instanceof ProxyHandlerSlot, void 0, {
+    F: __dxlog_file11,
+    L: 32,
+    S: void 0,
+    A: [
+      "value instanceof ProxyHandlerSlot",
+      ""
+    ]
+  });
+  return value2;
+};
+var getProxyTarget = (proxy) => {
+  return getProxySlot(proxy).target;
+};
+var getProxyHandler = (proxy) => {
+  return getProxySlot(proxy).handler;
+};
+var dangerouslySetProxyId = (obj, id) => {
+  getProxySlot(obj).target.id = id;
+};
+var createProxy = (target, handler) => {
+  const existingProxy = handler._proxyMap.get(target);
+  if (existingProxy) {
+    return existingProxy;
   }
-  return obj[ObjectDeletedId] ?? false;
+  const proxy = new Proxy(target, new ProxyHandlerSlot(target, handler));
+  handler.init(target);
+  handler._proxyMap.set(target, proxy);
+  return proxy;
 };
-
-// src/internal/object/ids.ts
-import { DXN as DXN7, ObjectId as ObjectId7, QueueSubspaceTags, SpaceId } from "@dxos/keys";
-var createQueueDXN = (spaceId = SpaceId.random(), queueId = ObjectId7.random()) => new DXN7(DXN7.kind.QUEUE, [
-  QueueSubspaceTags.DATA,
-  spaceId,
-  queueId
-]);
-
-// src/internal/object/schema-validator.ts
-import * as Schema13 from "effect/Schema";
-import * as SchemaAST7 from "effect/SchemaAST";
-import { invariant as invariant9 } from "@dxos/invariant";
-import { log as log2 } from "@dxos/log";
-var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/schema-validator.ts";
-var SchemaValidator = class {
+var ProxyHandlerSlot = class {
+  target;
+  _handler;
   /**
-  * Recursively check that schema specifies constructions we can handle.
-  * Validates there are no ambiguous discriminated union types.
+  * @param target Original object.
+  * @param _handler Handles intercepted operations.
   */
-  static validateSchema(schema) {
-    const visitAll = (nodes) => nodes.forEach((node) => this.validateSchema(Schema13.make(node)));
-    if (SchemaAST7.isUnion(schema.ast)) {
-      const typeAstList = schema.ast.types.filter((type) => SchemaAST7.isTypeLiteral(type));
-      if (typeAstList.length > 1) {
-        getTypeDiscriminators(typeAstList);
-      }
-      visitAll(typeAstList);
-    } else if (SchemaAST7.isTupleType(schema.ast)) {
-      const positionalTypes = schema.ast.elements.map((t) => t.type);
-      const allTypes = positionalTypes.concat(schema.ast.rest.map((t) => t.type));
-      visitAll(allTypes);
-    } else if (SchemaAST7.isTypeLiteral(schema.ast)) {
-      visitAll(SchemaAST7.getPropertySignatures(schema.ast).map((p) => p.type));
-    }
+  constructor(target, _handler) {
+    this.target = target;
+    this._handler = _handler;
   }
-  static hasTypeAnnotation(rootObjectSchema, property, annotation) {
-    try {
-      let type = this.getPropertySchema(rootObjectSchema, [
-        property
-      ]);
-      if (SchemaAST7.isTupleType(type.ast)) {
-        type = this.getPropertySchema(rootObjectSchema, [
-          property,
-          "0"
-        ]);
+  get handler() {
+    invariant11(this._handler, void 0, {
+      F: __dxlog_file11,
+      L: 91,
+      S: this,
+      A: [
+        "this._handler",
+        ""
+      ]
+    });
+    return this._handler;
+  }
+  // TODO(burdon): Requires comment.
+  setHandler(handler) {
+    this._handler = handler;
+  }
+  /**
+  * Get value.
+  */
+  get(target, prop, receiver) {
+    if (prop === symbolIsProxy) {
+      return this;
+    }
+    if (!this._handler || !this._handler.get) {
+      return Reflect.get(target, prop, receiver);
+    }
+    return this._handler.get(target, prop, receiver);
+  }
+  static {
+    const TRAPS = [
+      "apply",
+      "construct",
+      "defineProperty",
+      "deleteProperty",
+      "get",
+      "getOwnPropertyDescriptor",
+      "getPrototypeOf",
+      "has",
+      "isExtensible",
+      "ownKeys",
+      "preventExtensions",
+      "set",
+      "setPrototypeOf"
+    ];
+    for (const trap of TRAPS) {
+      if (trap === "get") {
+        continue;
       }
-      return type.ast.annotations[annotation] != null;
-    } catch {
-      return false;
+      Object.defineProperty(this.prototype, trap, {
+        enumerable: false,
+        value: function(...args) {
+          if (!this._handler || !this._handler[trap]) {
+            return Reflect[trap](...args);
+          }
+          return this._handler[trap].apply(this._handler, args);
+        }
+      });
     }
   }
-  static getPropertySchema(rootObjectSchema, propertyPath, getProperty = () => null) {
-    let schema = rootObjectSchema;
-    for (let i = 0; i < propertyPath.length; i++) {
-      const propertyName = propertyPath[i];
-      const tupleAst = unwrapArray(schema.ast);
-      if (tupleAst != null) {
-        schema = getArrayElementSchema(tupleAst, propertyName);
-      } else {
-        const propertyType = getPropertyType(schema.ast, propertyName.toString(), (propertyName2) => getProperty([
-          ...propertyPath.slice(0, i),
-          propertyName2
-        ]));
-        if (propertyType == null) {
-          log2.warn("unknown property", {
-            path: propertyPath,
-            property: propertyName
-          }, {
-            F: __dxlog_file9,
-            L: 71,
+};
+
+// src/internal/proxy/typed-handler.ts
+import * as Schema12 from "effect/Schema";
+import * as SchemaAST8 from "effect/SchemaAST";
+import { Event as Event2 } from "@dxos/async";
+import { inspectCustom as inspectCustom2 } from "@dxos/debug";
+import { invariant as invariant14 } from "@dxos/invariant";
+
+// src/internal/proxy/ownership.ts
+import { invariant as invariant12 } from "@dxos/invariant";
+var __dxlog_file12 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/ownership.ts";
+var EchoOwner = Symbol.for("@dxos/echo/Owner");
+var getRawTarget = (value2) => {
+  return isProxy(value2) ? getProxyTarget(value2) : value2;
+};
+var getOwner = (value2) => {
+  return value2?.[EchoOwner];
+};
+var setMetaOwner = (metaTarget, parent) => {
+  defineHiddenProperty(metaTarget, EchoOwner, parent);
+};
+var setOwnerRecursive = (value2, owner, options = {}) => {
+  const { visited = /* @__PURE__ */ new Set(), depth = 0, allowedPreviousOwner } = options;
+  if (value2 == null || typeof value2 !== "object") {
+    return;
+  }
+  const actualValue = getRawTarget(value2);
+  if (visited.has(actualValue)) {
+    return;
+  }
+  visited.add(actualValue);
+  const existingOwner = getOwner(actualValue);
+  const isRootEchoObject = EventId in actualValue;
+  let newAllowedPreviousOwner = allowedPreviousOwner;
+  if (isRootEchoObject && depth === 0) {
+    newAllowedPreviousOwner = actualValue;
+  }
+  if (!isRootEchoObject) {
+    const ownershipAllowed = existingOwner == null || existingOwner === owner || existingOwner === newAllowedPreviousOwner;
+    invariant12(ownershipAllowed, "Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.", {
+      F: __dxlog_file12,
+      L: 102,
+      S: void 0,
+      A: [
+        "ownershipAllowed",
+        "'Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.'"
+      ]
+    });
+  }
+  defineHiddenProperty(actualValue, EchoOwner, owner);
+  const recursiveOptions = {
+    visited,
+    depth: depth + 1,
+    allowedPreviousOwner: newAllowedPreviousOwner
+  };
+  if (Array.isArray(actualValue)) {
+    for (const item of actualValue) {
+      if (isValidProxyTarget(item) || isProxy(item)) {
+        setOwnerRecursive(item, owner, recursiveOptions);
+      }
+    }
+  } else {
+    for (const key in actualValue) {
+      if (Object.prototype.hasOwnProperty.call(actualValue, key)) {
+        const nested = actualValue[key];
+        if (isValidProxyTarget(nested) || isProxy(nested)) {
+          setOwnerRecursive(nested, owner, recursiveOptions);
+        }
+      }
+    }
+  }
+};
+var traverseObjectGraph = (value2, visitor, visited = /* @__PURE__ */ new Set()) => {
+  if (value2 == null || typeof value2 !== "object") {
+    return false;
+  }
+  const actualValue = getRawTarget(value2);
+  if (visited.has(actualValue)) {
+    return false;
+  }
+  visited.add(actualValue);
+  if (visitor(actualValue)) {
+    return true;
+  }
+  if (Array.isArray(actualValue)) {
+    for (const item of actualValue) {
+      if (traverseObjectGraph(item, visitor, visited)) {
+        return true;
+      }
+    }
+  } else {
+    for (const key in actualValue) {
+      if (Object.prototype.hasOwnProperty.call(actualValue, key)) {
+        if (traverseObjectGraph(actualValue[key], visitor, visited)) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+};
+var wouldCreateCycle = (targetRoot, value2) => traverseObjectGraph(value2, (v) => v === targetRoot);
+var hasForeignOwner = (value2, target) => traverseObjectGraph(value2, (v) => {
+  const owner = getOwner(v);
+  if (owner != null && owner !== target) {
+    return true;
+  }
+  if (EventId in v && v !== target) {
+    return true;
+  }
+  return false;
+});
+var MAX_OWNER_DEPTH = 100;
+var getEchoRoot = (target, depth = 0) => {
+  invariant12(depth < MAX_OWNER_DEPTH, "Owner chain too deep - possible circular ownership", {
+    F: __dxlog_file12,
+    L: 221,
+    S: void 0,
+    A: [
+      "depth < MAX_OWNER_DEPTH",
+      "'Owner chain too deep - possible circular ownership'"
+    ]
+  });
+  if (KindId in target) {
+    return target;
+  }
+  const owner = getOwner(target);
+  if (owner) {
+    return getEchoRoot(owner, depth + 1);
+  }
+  return target;
+};
+var notifyOwnerChain = (target) => {
+  const owner = getOwner(target);
+  if (owner) {
+    queueOwnerNotification(getEchoRoot(owner));
+    notifyOwnerChain(owner);
+  }
+};
+
+// src/internal/proxy/proxy-types.ts
+var objectData = Symbol.for("@dxos/live-object/objectData");
+
+// src/internal/proxy/reactive-array.ts
+var checkArrayMutationAllowed = (arr, method) => {
+  const target = isProxy(arr) ? getProxyTarget(arr) : arr;
+  const echoRoot = getEchoRoot(target);
+  const isInitialized = echoRoot[ChangeId] === true || EventId in echoRoot;
+  if (!isInitialized) {
+    return;
+  }
+  if (!isInChangeContext(echoRoot)) {
+    throw createArrayMethodError(method);
+  }
+};
+var ReactiveArray = class extends Array {
+  static get [Symbol.species]() {
+    return Array;
+  }
+  static {
+    const BATCHED_METHODS = [
+      "push",
+      "pop",
+      "shift",
+      "unshift",
+      "splice",
+      "sort",
+      "reverse"
+    ];
+    for (const method of BATCHED_METHODS) {
+      Object.defineProperty(this.prototype, method, {
+        enumerable: false,
+        value: function(...args) {
+          checkArrayMutationAllowed(this, method);
+          let result;
+          batchEvents(() => {
+            result = Array.prototype[method].apply(this, args);
+          });
+          return result;
+        }
+      });
+    }
+  }
+};
+
+// src/internal/proxy/schema-validator.ts
+import * as Schema11 from "effect/Schema";
+import * as SchemaAST7 from "effect/SchemaAST";
+import { invariant as invariant13 } from "@dxos/invariant";
+import { log as log2 } from "@dxos/log";
+var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/schema-validator.ts";
+var SchemaValidator = class {
+  /**
+  * Recursively check that schema specifies constructions we can handle.
+  * Validates there are no ambiguous discriminated union types.
+  */
+  static validateSchema(schema) {
+    const visitAll = (nodes) => nodes.forEach((node) => this.validateSchema(Schema11.make(node)));
+    if (SchemaAST7.isUnion(schema.ast)) {
+      const typeAstList = schema.ast.types.filter((type) => SchemaAST7.isTypeLiteral(type));
+      if (typeAstList.length > 1) {
+        getTypeDiscriminators(typeAstList);
+      }
+      visitAll(typeAstList);
+    } else if (SchemaAST7.isTupleType(schema.ast)) {
+      const positionalTypes = schema.ast.elements.map((t) => t.type);
+      const allTypes = positionalTypes.concat(schema.ast.rest.map((t) => t.type));
+      visitAll(allTypes);
+    } else if (SchemaAST7.isTypeLiteral(schema.ast)) {
+      visitAll(SchemaAST7.getPropertySignatures(schema.ast).map((p) => p.type));
+    }
+  }
+  static hasTypeAnnotation(rootObjectSchema, property, annotation) {
+    try {
+      let type = this.getPropertySchema(rootObjectSchema, [
+        property
+      ]);
+      if (SchemaAST7.isTupleType(type.ast)) {
+        type = this.getPropertySchema(rootObjectSchema, [
+          property,
+          "0"
+        ]);
+      }
+      return type.ast.annotations[annotation] != null;
+    } catch {
+      return false;
+    }
+  }
+  static getPropertySchema(rootObjectSchema, propertyPath, getProperty = () => null) {
+    let schema = rootObjectSchema;
+    for (let i = 0; i < propertyPath.length; i++) {
+      const propertyName = propertyPath[i];
+      const tupleAst = unwrapArray(schema.ast);
+      if (tupleAst != null) {
+        schema = getArrayElementSchema(tupleAst, propertyName);
+      } else {
+        const propertyType = getPropertyType(schema.ast, propertyName.toString(), (propertyName2) => getProperty([
+          ...propertyPath.slice(0, i),
+          propertyName2
+        ]));
+        if (propertyType == null) {
+          log2.warn("unknown property", {
+            path: propertyPath,
+            property: propertyName
+          }, {
+            F: __dxlog_file13,
+            L: 71,
             S: this,
             C: (f, a) => f(...a)
           });
           continue;
         }
-        schema = Schema13.make(propertyType).annotations(propertyType.annotations);
+        schema = Schema11.make(propertyType).annotations(propertyType.annotations);
       }
     }
     return schema;
   }
   static getTargetPropertySchema(target, prop) {
     const schema = target[SchemaId];
-    invariant9(schema, "target has no schema", {
-      F: __dxlog_file9,
+    invariant13(schema, "target has no schema", {
+      F: __dxlog_file13,
       L: 84,
       S: this,
       A: [
@@ -2029,10 +2392,10 @@ var SchemaValidator = class {
     }
     const propertyType = getPropertyType(schema.ast, prop.toString(), (prop2) => target[prop2]);
     if (propertyType == null) {
-      return Schema13.Any;
+      return Schema11.Any;
     }
-    invariant9(propertyType, `invalid property: ${prop.toString()}`, {
-      F: __dxlog_file9,
+    invariant13(propertyType, `invalid property: ${prop.toString()}`, {
+      F: __dxlog_file13,
       L: 95,
       S: this,
       A: [
@@ -2040,14 +2403,14 @@ var SchemaValidator = class {
         "`invalid property: ${prop.toString()}`"
       ]
     });
-    return Schema13.make(propertyType);
+    return Schema11.make(propertyType);
   }
 };
 var getArrayElementSchema = (tupleAst, property) => {
   const elementIndex = typeof property === "string" ? parseInt(property, 10) : Number.NaN;
   if (Number.isNaN(elementIndex)) {
-    invariant9(property === "length", `invalid array property: ${String(property)}`, {
-      F: __dxlog_file9,
+    invariant13(property === "length", `invalid array property: ${String(property)}`, {
+      F: __dxlog_file13,
       L: 111,
       S: void 0,
       A: [
@@ -2055,14 +2418,14 @@ var getArrayElementSchema = (tupleAst, property) => {
         "`invalid array property: ${String(property)}`"
       ]
     });
-    return Schema13.Number;
+    return Schema11.Number;
   }
   if (elementIndex < tupleAst.elements.length) {
     const elementType = tupleAst.elements[elementIndex].type;
-    return Schema13.make(elementType).annotations(elementType.annotations);
+    return Schema11.make(elementType).annotations(elementType.annotations);
   }
   const restType = tupleAst.rest;
-  return Schema13.make(restType[0].type).annotations(restType[0].annotations);
+  return Schema11.make(restType[0].type).annotations(restType[0].annotations);
 };
 var flattenUnion = (typeAst) => SchemaAST7.isUnion(typeAst) ? typeAst.types.flatMap(flattenUnion) : [
   typeAst
@@ -2079,8 +2442,8 @@ var getProperties = (typeAst, getTargetPropertyFn) => {
   const typeDiscriminators = getTypeDiscriminators(typeAstList);
   const targetPropertyValue = getTargetPropertyFn(String(typeDiscriminators[0].name));
   const typeIndex = typeDiscriminators.findIndex((p) => targetPropertyValue === p.type.literal);
-  invariant9(typeIndex !== -1, "discriminator field not set on target", {
-    F: __dxlog_file9,
+  invariant13(typeIndex !== -1, "discriminator field not set on target", {
+    F: __dxlog_file13,
     L: 142,
     S: void 0,
     A: [
@@ -2117,8 +2480,8 @@ var getTypeDiscriminators = (typeAstList) => {
   const isValidDiscriminator = discriminatorPropCandidates.every((p) => p.name === propertyName && !p.isOptional);
   const everyTypeHasDiscriminator = discriminatorPropCandidates.length === typeAstList.length;
   const isDiscriminatedUnion = isValidDiscriminator && everyTypeHasDiscriminator;
-  invariant9(isDiscriminatedUnion, "type ambiguity: every type in a union must have a single unique-literal field", {
-    F: __dxlog_file9,
+  invariant13(isDiscriminatedUnion, "type ambiguity: every type in a union must have a single unique-literal field", {
+    F: __dxlog_file13,
     L: 193,
     S: void 0,
     A: [
@@ -2147,312 +2510,860 @@ var unwrapAst = (rootAst, predicate) => {
       return predicate == null ? ast : null;
     }
   }
-  return null;
-};
-var unwrapArray = (ast) => unwrapAst(ast, SchemaAST7.isTupleType);
-var checkIdNotPresentOnSchema = (schema) => {
-  invariant9(SchemaAST7.isTypeLiteral(schema.ast), void 0, {
-    F: __dxlog_file9,
-    L: 236,
-    S: void 0,
-    A: [
-      "SchemaAST.isTypeLiteral(schema.ast)",
-      ""
-    ]
+  return null;
+};
+var unwrapArray = (ast) => unwrapAst(ast, SchemaAST7.isTupleType);
+var checkIdNotPresentOnSchema = (schema) => {
+  invariant13(SchemaAST7.isTypeLiteral(schema.ast), void 0, {
+    F: __dxlog_file13,
+    L: 236,
+    S: void 0,
+    A: [
+      "SchemaAST.isTypeLiteral(schema.ast)",
+      ""
+    ]
+  });
+  const idProperty = SchemaAST7.getPropertySignatures(schema.ast).find((prop) => prop.name === "id");
+  if (idProperty != null) {
+    throw new Error('"id" property name is reserved');
+  }
+};
+
+// src/internal/proxy/typed-handler.ts
+var __dxlog_file14 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/typed-handler.ts";
+var deepCopy = (value2, visited = /* @__PURE__ */ new Map()) => {
+  if (value2 == null || typeof value2 !== "object") {
+    return value2;
+  }
+  const actualValue = getRawTarget(value2);
+  if (visited.has(actualValue)) {
+    return visited.get(actualValue);
+  }
+  if (actualValue instanceof ReactiveArray) {
+    const copy2 = new ReactiveArray();
+    visited.set(actualValue, copy2);
+    for (const item of actualValue) {
+      copy2.push(deepCopy(item, visited));
+    }
+    copyHiddenProperties(actualValue, copy2);
+    return copy2;
+  }
+  const proto = Object.getPrototypeOf(actualValue);
+  if (proto !== Object.prototype && proto !== Array.prototype && proto !== null) {
+    return value2;
+  }
+  if (Array.isArray(actualValue)) {
+    const copy2 = new ReactiveArray();
+    visited.set(actualValue, copy2);
+    for (const item of actualValue) {
+      copy2.push(deepCopy(item, visited));
+    }
+    return copy2;
+  }
+  const copy = {};
+  visited.set(actualValue, copy);
+  for (const key of Object.keys(actualValue)) {
+    copy[key] = deepCopy(actualValue[key], visited);
+  }
+  copyHiddenProperties(actualValue, copy);
+  return copy;
+};
+var copyHiddenProperties = (source, target) => {
+  if (SchemaId in source) {
+    defineHiddenProperty(target, SchemaId, source[SchemaId]);
+  }
+  if (TypeId in source) {
+    defineHiddenProperty(target, TypeId, source[TypeId]);
+  }
+};
+var TypedReactiveHandler = class _TypedReactiveHandler {
+  static instance = new _TypedReactiveHandler();
+  _proxyMap = /* @__PURE__ */ new WeakMap();
+  _inSet = false;
+  constructor() {
+  }
+  init(target) {
+    invariant14(typeof target === "object" && target !== null, void 0, {
+      F: __dxlog_file14,
+      L: 148,
+      S: this,
+      A: [
+        "typeof target === 'object' && target !== null",
+        ""
+      ]
+    });
+    invariant14(SchemaId in target, "Schema is not defined for the target", {
+      F: __dxlog_file14,
+      L: 149,
+      S: this,
+      A: [
+        "SchemaId in target",
+        "'Schema is not defined for the target'"
+      ]
+    });
+    const hasOwner = !!getOwner(target);
+    if (!(EventId in target) && !hasOwner) {
+      defineHiddenProperty(target, EventId, new Event2());
+    }
+    defineHiddenProperty(target, ObjectDeletedId, false);
+    if (!hasOwner && !(ChangeId in target)) {
+      defineHiddenProperty(target, ChangeId, true);
+    }
+    if (!hasOwner) {
+      for (const key in target) {
+        if (target[symbolIsProxy]) {
+          continue;
+        }
+        let value2 = target[key];
+        if (isValidProxyTarget(value2) || isProxy(value2)) {
+          if (hasForeignOwner(value2, target)) {
+            value2 = deepCopy(value2);
+            target[key] = value2;
+          }
+          setOwnerRecursive(value2, target);
+        }
+      }
+    }
+    Object.defineProperty(target, inspectCustom2, {
+      enumerable: false,
+      configurable: true,
+      value: this._inspect.bind(target)
+    });
+  }
+  get(target, prop, receiver) {
+    switch (prop) {
+      // TODO(burdon): Remove?
+      case objectData: {
+        return toJSON(target);
+      }
+      case ChangeId: {
+        if (target[ChangeId] !== true) {
+          return void 0;
+        }
+        return (callback) => executeChange(target, target, receiver, callback);
+      }
+    }
+    if (Object.getOwnPropertyDescriptor(target, prop)?.get) {
+      return Reflect.get(target, prop, receiver);
+    }
+    const value2 = Reflect.get(target, prop, receiver);
+    if (isValidProxyTarget(value2)) {
+      return createProxy(value2, this);
+    }
+    return value2;
+  }
+  set(target, prop, value2, receiver) {
+    const echoRoot = getEchoRoot(target);
+    const isInitialized = ChangeId in echoRoot || EventId in echoRoot;
+    const isSymbolProp = typeof prop === "symbol";
+    if (isInitialized && !isSymbolProp && !isInChangeContext(echoRoot)) {
+      throw new Error(`Cannot modify object property "${String(prop)}" outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
+    }
+    let result = false;
+    this._inSet = true;
+    try {
+      batchEvents(() => {
+        const { echoRoot: _, preparedValue } = this._prepareValueForAssignment(target, prop, value2);
+        result = Reflect.set(target, prop, preparedValue, receiver);
+        if (isInitialized) {
+          queueNotification(echoRoot);
+          notifyOwnerChain(target);
+        }
+      });
+    } finally {
+      this._inSet = false;
+    }
+    return result;
+  }
+  ownKeys(target) {
+    return Reflect.ownKeys(target);
+  }
+  deleteProperty(target, property) {
+    const echoRoot = getEchoRoot(target);
+    const isInitialized = echoRoot[ChangeId] === true || EventId in echoRoot;
+    const isSymbolProp = typeof property === "symbol";
+    if (isInitialized && !isSymbolProp && !isInChangeContext(echoRoot)) {
+      throw createPropertyDeleteError(property);
+    }
+    const result = Reflect.deleteProperty(target, property);
+    if (isInitialized) {
+      queueNotification(echoRoot);
+    }
+    return result;
+  }
+  defineProperty(target, property, attributes) {
+    const echoRoot = getEchoRoot(target);
+    const isInitialized = ChangeId in echoRoot || EventId in echoRoot;
+    const isSymbolProp = typeof property === "symbol";
+    if (isInitialized && !isSymbolProp && !isInChangeContext(echoRoot)) {
+      throw new Error(`Cannot modify object property "${String(property)}" outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
+    }
+    const { echoRoot: _, preparedValue } = this._prepareValueForAssignment(target, property, attributes.value);
+    const result = Reflect.defineProperty(target, property, {
+      ...attributes,
+      value: preparedValue
+    });
+    if (!this._inSet && isInitialized) {
+      queueNotification(echoRoot);
+    }
+    return result;
+  }
+  /**
+  * Prepare a value for assignment to a typed object property.
+  * Handles cycle detection, copy-on-assign, array conversion, validation, and ownership.
+  */
+  _prepareValueForAssignment(target, prop, value2) {
+    const echoRoot = getEchoRoot(target);
+    if (prop === ParentId) {
+      return {
+        echoRoot,
+        preparedValue: value2
+      };
+    }
+    if (isValidProxyTarget(value2) || isProxy(value2)) {
+      if (wouldCreateCycle(echoRoot, value2)) {
+        throw new Error("Cannot create cycles in typed object graph. Consider using Ref for circular references.");
+      }
+    }
+    if (isValidProxyTarget(value2) || isProxy(value2)) {
+      const actualValue = getRawTarget(value2);
+      const isRootEchoObject = EventId in actualValue;
+      if (isRootEchoObject) {
+        throw new Error("Object references must be wrapped with `Ref.make`");
+      }
+    }
+    if (isValidProxyTarget(value2) || isProxy(value2)) {
+      const actualValue = getRawTarget(value2);
+      const existingOwner = getOwner(actualValue);
+      if (existingOwner != null && existingOwner !== echoRoot) {
+        value2 = deepCopy(value2);
+      }
+    }
+    if (Array.isArray(value2) && !(value2 instanceof ReactiveArray)) {
+      value2 = ReactiveArray.from(value2);
+    }
+    const validatedValue = this._validateValue(target, prop, value2);
+    if (isValidProxyTarget(validatedValue) || isProxy(validatedValue)) {
+      setOwnerRecursive(validatedValue, echoRoot);
+    }
+    return {
+      echoRoot,
+      preparedValue: validatedValue
+    };
+  }
+  _validateValue(target, prop, value2) {
+    if (prop === ParentId) {
+      return value2;
+    }
+    const schema = SchemaValidator.getTargetPropertySchema(target, prop);
+    const _ = Schema12.asserts(schema)(value2);
+    if (isValidProxyTarget(value2)) {
+      setSchemaProperties(value2, schema);
+    }
+    return value2;
+  }
+  _inspect(_, options, inspectFn) {
+    const inspected = inspectFn(this, {
+      ...options,
+      showHidden: false,
+      customInspect: false
+    });
+    return `Typed ${inspected}`;
+  }
+};
+var toJSON = (target) => {
+  return {
+    "@type": "TypedReactiveObject",
+    ...target
+  };
+};
+var setSchemaProperties = (obj, schema) => {
+  const schemaType = getSchemaDXN(schema);
+  if (schemaType != null) {
+    defineHiddenProperty(obj, TypeId, schemaType);
+  }
+  defineHiddenProperty(obj, SchemaId, schema);
+  for (const key in obj) {
+    if (isValidProxyTarget(obj[key])) {
+      const elementSchema = SchemaValidator.getTargetPropertySchema(obj, key);
+      if (elementSchema != null) {
+        setSchemaProperties(obj[key], elementSchema);
+      }
+    }
+  }
+};
+var prepareTypedTarget = (target, schema) => {
+  if (!SchemaAST8.isTypeLiteral(schema.ast)) {
+    throw new Error("schema has to describe an object type");
+  }
+  SchemaValidator.validateSchema(schema);
+  const _ = Schema12.asserts(schema)(target);
+  makeArraysReactive(target);
+  setSchemaProperties(target, schema);
+};
+var makeArraysReactive = (target) => {
+  for (const key in target) {
+    if (target[symbolIsProxy]) {
+      continue;
+    }
+    if (Array.isArray(target[key])) {
+      target[key] = ReactiveArray.from(target[key]);
+    }
+    if (typeof target[key] === "object") {
+      makeArraysReactive(target[key]);
+    }
+  }
+};
+
+// src/internal/proxy/make-object.ts
+var makeObject = (schema, obj, meta) => {
+  return createReactiveObject(Object.assign({}, obj), meta, schema);
+};
+var createReactiveObject = (obj, meta, schema) => {
+  if (!isValidProxyTarget(obj)) {
+    throw new Error("Value cannot be made into a reactive object.");
+  }
+  if (!schema) {
+    throw new Error("Schema is required for reactive objects. Use Atom for untyped reactive state.");
+  }
+  const parent = obj[ParentId];
+  if (parent !== void 0) {
+    delete obj[ParentId];
+  }
+  const annotation = getTypeAnnotation(schema);
+  if (annotation) {
+    setIdOnTarget(obj);
+    defineHiddenProperty(obj, KindId, annotation.kind);
+  }
+  initMeta(obj, meta);
+  if (parent !== void 0) {
+    defineHiddenProperty(obj, ParentId, parent);
+  }
+  prepareTypedTarget(obj, schema);
+  attachTypedJsonSerializer(obj);
+  const proxy = createProxy(obj, TypedReactiveHandler.instance);
+  const metaProxy = obj[MetaId];
+  if (metaProxy) {
+    const metaTarget = getProxyTarget(metaProxy);
+    if (metaTarget) {
+      setMetaOwner(metaTarget, obj);
+    }
+  }
+  return proxy;
+};
+var setIdOnTarget = (target) => {
+  if ("id" in target && target.id !== void 0 && target.id !== null) {
+    if (!ObjectId5.isValid(target.id)) {
+      throw new Error("Invalid object id format.");
+    }
+  } else {
+    target.id = ObjectId5.random();
+  }
+};
+var initMeta = (obj, meta = {
+  keys: []
+}) => {
+  prepareTypedTarget(meta, ObjectMetaSchema);
+  defineHiddenProperty(obj, MetaId, createProxy(meta, TypedReactiveHandler.instance));
+};
+
+// src/internal/proxy/reactive.ts
+var subscribe = (obj, callback) => {
+  const target = getProxyTarget(obj);
+  if (target && EventId in target) {
+    return target[EventId].on(callback);
+  }
+  return () => {
+  };
+};
+var change = (obj, callback) => {
+  const changeFn = obj[ChangeId];
+  if (changeFn) {
+    changeFn(callback);
+  } else {
+    callback(obj);
+  }
+};
+
+// src/internal/object/inspect.ts
+import { inspectCustom as inspectCustom3 } from "@dxos/debug";
+var attachedTypedObjectInspector = (obj) => {
+  const descriptor = Object.getOwnPropertyDescriptor(obj, inspectCustom3);
+  if (descriptor) {
+    return;
+  }
+  Object.defineProperty(obj, inspectCustom3, {
+    value: typedObjectInspectFunction,
+    writable: false,
+    enumerable: false,
+    configurable: true
+  });
+};
+var typedObjectInspectFunction = function(depth, options, inspect) {
+  const { id, ...props } = this;
+  return inspect({
+    id,
+    [ATTR_TYPE]: getTypeDXN(this),
+    ...props,
+    [ATTR_META]: this[MetaId]
+  }, options);
+};
+
+// src/internal/object/json-serializer.ts
+import * as Schema13 from "effect/Schema";
+import { raise as raise3 } from "@dxos/debug";
+import { ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
+import { assertArgument as assertArgument7, invariant as invariant15 } from "@dxos/invariant";
+import { DXN as DXN7, ObjectId as ObjectId6 } from "@dxos/keys";
+import { assumeType as assumeType4, deepMapValues as deepMapValues2, visitValues } from "@dxos/util";
+var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/json-serializer.ts";
+var objectToJSON = (obj) => {
+  const typename = getTypeDXN(obj)?.toString();
+  invariant15(typename && typeof typename === "string", void 0, {
+    F: __dxlog_file15,
+    L: 64,
+    S: void 0,
+    A: [
+      "typename && typeof typename === 'string'",
+      ""
+    ]
+  });
+  return typedJsonSerializer.call(obj);
+};
+var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
+  assumeType4(jsonData);
+  assertArgument7(typeof jsonData === "object" && jsonData !== null, "jsonData", "expect object");
+  assertArgument7(typeof jsonData[ATTR_TYPE] === "string", "jsonData[ATTR_TYPE]", "expected object to have a type");
+  assertArgument7(typeof jsonData.id === "string", "jsonData.id", "expected object to have an id");
+  const type = DXN7.parse(jsonData[ATTR_TYPE]);
+  const schema = await refResolver?.resolveSchema(type);
+  invariant15(schema === void 0 || Schema13.isSchema(schema), void 0, {
+    F: __dxlog_file15,
+    L: 85,
+    S: void 0,
+    A: [
+      "schema === undefined || Schema.isSchema(schema)",
+      ""
+    ]
+  });
+  let obj;
+  if (schema != null) {
+    obj = await schema.pipe(Schema13.decodeUnknownPromise)(jsonData);
+    if (refResolver) {
+      setRefResolverOnData(obj, refResolver);
+    }
+  } else {
+    obj = decodeGeneric(jsonData, {
+      refResolver
+    });
+  }
+  invariant15(ObjectId6.isValid(obj.id), "Invalid object id", {
+    F: __dxlog_file15,
+    L: 97,
+    S: void 0,
+    A: [
+      "ObjectId.isValid(obj.id)",
+      "'Invalid object id'"
+    ]
+  });
+  setTypename(obj, type);
+  if (schema) {
+    setSchema(obj, schema);
+  }
+  const isRelation = typeof jsonData[ATTR_RELATION_SOURCE] === "string" || typeof jsonData[ATTR_RELATION_TARGET] === "string";
+  if (isRelation) {
+    const sourceDxn = DXN7.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise3(new TypeError("Missing relation source")));
+    const targetDxn = DXN7.parse(jsonData[ATTR_RELATION_TARGET] ?? raise3(new TypeError("Missing relation target")));
+    const source = await refResolver?.resolve(sourceDxn);
+    const target = await refResolver?.resolve(targetDxn);
+    defineHiddenProperty(obj, KindId, EntityKind.Relation);
+    defineHiddenProperty(obj, RelationSourceDXNId, sourceDxn);
+    defineHiddenProperty(obj, RelationTargetDXNId, targetDxn);
+    defineHiddenProperty(obj, RelationSourceId, source);
+    defineHiddenProperty(obj, RelationTargetId, target);
+  } else {
+    defineHiddenProperty(obj, KindId, EntityKind.Object);
+  }
+  if (typeof jsonData[ATTR_META] === "object") {
+    const meta = await ObjectMetaSchema.pipe(Schema13.decodeUnknownPromise)(jsonData[ATTR_META]);
+    invariant15(Array.isArray(meta.keys), void 0, {
+      F: __dxlog_file15,
+      L: 123,
+      S: void 0,
+      A: [
+        "Array.isArray(meta.keys)",
+        ""
+      ]
+    });
+    defineHiddenProperty(obj, MetaId, meta);
+  } else {
+    defineHiddenProperty(obj, MetaId, {
+      keys: []
+    });
+  }
+  if (jsonData[ATTR_PARENT]) {
+    const parentDxn = DXN7.parse(jsonData[ATTR_PARENT]);
+    const parent = await refResolver?.resolve(parentDxn);
+    defineHiddenProperty(obj, ParentId, parent);
+  }
+  if (dxn) {
+    defineHiddenProperty(obj, SelfDXNId, dxn);
+  }
+  assertObjectModel(obj);
+  invariant15(obj[ATTR_TYPE] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 142,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_TYPE] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  invariant15(obj[ATTR_META] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 143,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_META] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  invariant15(obj[ATTR_DELETED] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 144,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_DELETED] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  invariant15(obj[ATTR_SELF_DXN] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 145,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_SELF_DXN] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  invariant15(obj[ATTR_RELATION_SOURCE] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 146,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_RELATION_SOURCE] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  invariant15(obj[ATTR_RELATION_TARGET] === void 0, "Invalid object model", {
+    F: __dxlog_file15,
+    L: 147,
+    S: void 0,
+    A: [
+      "(obj as any)[ATTR_RELATION_TARGET] === undefined",
+      "'Invalid object model'"
+    ]
+  });
+  return obj;
+};
+var decodeGeneric = (jsonData, options) => {
+  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDxn, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
+  return deepMapValues2(props, (value2, visitor) => {
+    if (isEncodedReference(value2)) {
+      return refFromEncodedReference(value2, options.refResolver);
+    }
+    return visitor(value2);
+  });
+};
+var setRefResolverOnData = (obj, refResolver) => {
+  const visitor = (value2) => {
+    if (Ref.isRef(value2)) {
+      setRefResolver(value2, refResolver);
+    } else {
+      visitValues(value2, visitor);
+    }
+  };
+  visitor(obj);
+};
+var objectStructureToJson = (objectId, structure) => {
+  return {
+    ...structure.data,
+    id: objectId,
+    [ATTR_TYPE]: ObjectStructure.getTypeReference(structure)?.["/"] ?? "",
+    [ATTR_DELETED]: ObjectStructure.isDeleted(structure),
+    [ATTR_PARENT]: ObjectStructure.getParent(structure)?.["/"],
+    [ATTR_RELATION_SOURCE]: ObjectStructure.getRelationSource(structure)?.["/"],
+    [ATTR_RELATION_TARGET]: ObjectStructure.getRelationTarget(structure)?.["/"]
+  };
+};
+
+// src/internal/object/create-object.ts
+var createObject = (schema, props) => {
+  const annotation = getTypeAnnotation(schema);
+  if (!annotation) {
+    throw new Error("Schema is not an ECHO schema");
+  }
+  assertArgument8(!("@type" in props), "data", "@type is not allowed");
+  assertArgument8(!(RelationSourceDXNId in props), "data", "Relation source DXN is not allowed in the constructor");
+  assertArgument8(!(RelationTargetDXNId in props), "data", "Relation target DXN is not allowed in the constructor");
+  assertArgument8(RelationSourceId in props === RelationTargetId in props, "data", "Relation source and target must be provided together");
+  const obj = {
+    ...props,
+    id: props.id ?? ObjectId7.random()
+  };
+  const kind = RelationSourceId in props ? EntityKind.Relation : EntityKind.Object;
+  defineHiddenProperty(obj, KindId, kind);
+  defineHiddenProperty(obj, MetaId, {
+    keys: []
   });
-  const idProperty = SchemaAST7.getPropertySignatures(schema.ast).find((prop) => prop.name === "id");
-  if (idProperty != null) {
-    throw new Error('"id" property name is reserved');
+  setSchema(obj, schema);
+  setTypename(obj, getSchemaDXN(schema) ?? failedInvariant("Missing schema DXN"));
+  attachTypedJsonSerializer(obj);
+  attachedTypedObjectInspector(obj);
+  if (kind === EntityKind.Relation) {
+    const sourceDXN = getObjectDXN(props[RelationSourceId]) ?? raise4(new Error("Unresolved relation source"));
+    const targetDXN = getObjectDXN(props[RelationTargetId]) ?? raise4(new Error("Unresolved relation target"));
+    defineHiddenProperty(obj, RelationSourceDXNId, sourceDXN);
+    defineHiddenProperty(obj, RelationTargetDXNId, targetDXN);
   }
+  assertObjectModel(obj);
+  return obj;
 };
 
-// src/internal/object/typed-object.ts
-import * as Schema14 from "effect/Schema";
-import * as SchemaAST8 from "effect/SchemaAST";
-import { invariant as invariant10 } from "@dxos/invariant";
-var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/typed-object.ts";
-var TypedObject = ({ typename: typenameParam, version: versionParam, disableValidation }) => {
-  const typename = TypenameSchema.make(typenameParam, {
-    disableValidation
-  });
-  const version = VersionSchema.make(versionParam, {
-    disableValidation
-  });
-  return (fields, options) => {
-    const schema = options?.record ? Schema14.Struct(fields, {
-      key: Schema14.String,
-      value: Schema14.Any
-    }) : Schema14.Struct(fields);
-    const typeSchema = Schema14.extend(Schema14.mutable(options?.partial ? Schema14.partial(schema) : schema), Schema14.Struct({
-      id: Schema14.String
-    }));
-    invariant10(typeof EntityKind.Object === "string", void 0, {
-      F: __dxlog_file10,
-      L: 77,
-      S: void 0,
-      A: [
-        "typeof EntityKind.Object === 'string'",
-        ""
-      ]
-    });
-    const annotatedSchema = typeSchema.annotations({
-      [TypeAnnotationId]: {
-        kind: EntityKind.Object,
-        typename,
-        version
-      },
-      [SchemaAST8.JSONSchemaAnnotationId]: makeTypeJsonSchemaAnnotation({
-        kind: EntityKind.Object,
-        typename,
-        version
-      })
-    });
-    return class TypedObject extends makeTypedEntityClass(typename, version, annotatedSchema) {
-    };
-  };
+// src/internal/object/deleted.ts
+var isDeleted = (obj) => {
+  if (obj[ObjectDeletedId] === void 0) {
+    return false;
+  }
+  return obj[ObjectDeletedId] ?? false;
 };
 
-// src/internal/proxy/make-object.ts
-import { ObjectId as ObjectId8 } from "@dxos/keys";
-import { UntypedReactiveHandler, createProxy as createProxy2, defineHiddenProperty as defineHiddenProperty4, isValidProxyTarget as isValidProxyTarget2 } from "@dxos/live-object";
+// src/internal/object/ids.ts
+import { DXN as DXN8, ObjectId as ObjectId8, QueueSubspaceTags, SpaceId } from "@dxos/keys";
+var createQueueDXN = (spaceId = SpaceId.random(), queueId = ObjectId8.random()) => new DXN8(DXN8.kind.QUEUE, [
+  QueueSubspaceTags.DATA,
+  spaceId,
+  queueId
+]);
 
-// src/internal/proxy/typed-handler.ts
-import * as Schema15 from "effect/Schema";
+// src/internal/object/set-value.ts
+import * as Match from "effect/Match";
+import * as Option3 from "effect/Option";
 import * as SchemaAST9 from "effect/SchemaAST";
-import { inspectCustom as inspectCustom2 } from "@dxos/debug";
-import { compositeRuntime as compositeRuntime2 } from "@dxos/echo-signals/runtime";
-import { invariant as invariant11 } from "@dxos/invariant";
-import { ReactiveArray, createProxy, defineHiddenProperty as defineHiddenProperty3, isValidProxyTarget, objectData, symbolIsProxy } from "@dxos/live-object";
-var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/proxy/typed-handler.ts";
-var symbolSignal = Symbol("signal");
-var symbolPropertySignal = Symbol("property-signal");
-var TypedReactiveHandler = class _TypedReactiveHandler {
-  static instance = new _TypedReactiveHandler();
-  _proxyMap = /* @__PURE__ */ new WeakMap();
-  constructor() {
-  }
-  init(target) {
-    invariant11(typeof target === "object" && target !== null, void 0, {
-      F: __dxlog_file11,
-      L: 65,
-      S: this,
-      A: [
-        "typeof target === 'object' && target !== null",
-        ""
-      ]
-    });
-    invariant11(SchemaId in target, "Schema is not defined for the target", {
-      F: __dxlog_file11,
-      L: 66,
-      S: this,
-      A: [
-        "SchemaId in target",
-        "'Schema is not defined for the target'"
-      ]
-    });
-    if (!(symbolSignal in target)) {
-      defineHiddenProperty3(target, symbolSignal, compositeRuntime2.createSignal());
-      defineHiddenProperty3(target, symbolPropertySignal, compositeRuntime2.createSignal());
-    }
-    defineHiddenProperty3(target, ObjectDeletedId, false);
-    for (const key of Object.getOwnPropertyNames(target)) {
-      const descriptor = Object.getOwnPropertyDescriptor(target, key);
-      if (descriptor.get) {
-        continue;
+import { getArrayElementType, getBaseType, getProperties as getProperties2, isArrayType, isNestedType } from "@dxos/effect";
+import { invariant as invariant16 } from "@dxos/invariant";
+var __dxlog_file16 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/set-value.ts";
+var setValue = (obj, path, value2) => {
+  invariant16(path.length > 0, "Path must not be empty", {
+    F: __dxlog_file16,
+    L: 27,
+    S: void 0,
+    A: [
+      "path.length > 0",
+      "'Path must not be empty'"
+    ]
+  });
+  const schema = getSchema(obj);
+  invariant16(schema != null, "Object must have a schema", {
+    F: __dxlog_file16,
+    L: 30,
+    S: void 0,
+    A: [
+      "schema != null",
+      "'Object must have a schema'"
+    ]
+  });
+  let parent = obj;
+  let currentAST = schema.ast;
+  for (let i = 0; i < path.length - 1; i++) {
+    const part = path[i];
+    const key = typeof part === "number" ? part : String(part);
+    if (parent[key] === void 0) {
+      const propertyAST = getPropertyAST(currentAST, String(part));
+      const shouldBeArray = propertyAST ? isArrayType(propertyAST) : false;
+      if (shouldBeArray) {
+        parent[key] = [];
+      } else {
+        const objWithDefaults = createObjectWithDefaults(propertyAST);
+        parent[key] = objWithDefaults;
       }
     }
-    Object.defineProperty(target, inspectCustom2, {
-      enumerable: false,
-      configurable: true,
-      value: this._inspect.bind(target)
-    });
+    parent = parent[key];
+    currentAST = getPropertyAST(currentAST, String(part));
   }
-  get(target, prop, receiver) {
-    switch (prop) {
-      // TODO(burdon): Remove?
-      case objectData: {
-        target[symbolSignal].notifyRead();
-        return toJSON(target);
-      }
-    }
-    if (Object.getOwnPropertyDescriptor(target, prop)?.get) {
-      target[symbolPropertySignal].notifyRead();
-      return Reflect.get(target, prop, receiver);
-    }
-    target[symbolSignal].notifyRead();
-    target[symbolPropertySignal].notifyRead();
-    const value = Reflect.get(target, prop, receiver);
-    if (isValidProxyTarget(value)) {
-      return createProxy(value, this);
-    }
-    return value;
+  const finalKey = path[path.length - 1];
+  parent[finalKey] = value2;
+  return value2;
+};
+var getPropertyAST = (ast, propertyName) => {
+  if (!ast) {
+    return void 0;
   }
-  set(target, prop, value, receiver) {
-    if (Array.isArray(value)) {
-      value = ReactiveArray.from(value);
+  if (isNestedType(ast)) {
+    const properties = getProperties2(ast);
+    const property = properties.find((p) => p.name.toString() === propertyName);
+    if (property) {
+      return getBaseType(property).type;
     }
-    let result = false;
-    compositeRuntime2.batch(() => {
-      const validatedValue = this._validateValue(target, prop, value);
-      result = Reflect.set(target, prop, validatedValue, receiver);
-      target[symbolSignal].notifyWrite();
-    });
-    return result;
-  }
-  ownKeys(target) {
-    target[symbolSignal].notifyRead();
-    target[symbolPropertySignal].notifyRead();
-    return Reflect.ownKeys(target);
   }
-  defineProperty(target, property, attributes) {
-    const validatedValue = this._validateValue(target, property, attributes.value);
-    const result = Reflect.defineProperty(target, property, {
-      ...attributes,
-      value: validatedValue
-    });
-    target[symbolPropertySignal].notifyWrite();
-    return result;
+  if (isArrayType(ast)) {
+    const elementType = getArrayElementType(ast);
+    return elementType;
   }
-  _validateValue(target, prop, value) {
-    const schema = SchemaValidator.getTargetPropertySchema(target, prop);
-    const _ = Schema15.asserts(schema)(value);
-    if (Array.isArray(value)) {
-      value = new ReactiveArray(...value);
-    }
-    if (isValidProxyTarget(value)) {
-      setSchemaProperties(value, schema);
-    }
-    return value;
+  return void 0;
+};
+var getRequiredProperties = (ast) => {
+  if (!ast) {
+    return [];
   }
-  _inspect(_, options, inspectFn) {
-    const inspected = inspectFn(this, {
-      ...options,
-      showHidden: false,
-      customInspect: false
-    });
-    return `Typed ${inspected}`;
+  if (!isNestedType(ast)) {
+    return [];
   }
+  const properties = getProperties2(ast);
+  return properties.filter((p) => !p.isOptional);
 };
-var toJSON = (target) => {
-  return {
-    "@type": "TypedReactiveObject",
-    ...target
-  };
-};
-var setSchemaProperties = (obj, schema) => {
-  const schemaType = getSchemaDXN(schema);
-  if (schemaType != null) {
-    defineHiddenProperty3(obj, TypeId, schemaType);
+var getDefaultValueForType = (ast) => {
+  if (!ast) {
+    return void 0;
   }
-  defineHiddenProperty3(obj, SchemaId, schema);
-  for (const key in obj) {
-    if (isValidProxyTarget(obj[key])) {
-      const elementSchema = SchemaValidator.getTargetPropertySchema(obj, key);
-      if (elementSchema != null) {
-        setSchemaProperties(obj[key], elementSchema);
-      }
-    }
+  const defaultValue = SchemaAST9.getDefaultAnnotation(ast);
+  if (Option3.isSome(defaultValue)) {
+    return defaultValue.value;
   }
+  return Match.value(ast).pipe(Match.when({
+    _tag: "StringKeyword"
+  }, () => ""), Match.when({
+    _tag: "NumberKeyword"
+  }, () => 0), Match.when({
+    _tag: "BooleanKeyword"
+  }, () => false), Match.orElse(() => void 0));
 };
-var prepareTypedTarget = (target, schema) => {
-  if (!SchemaAST9.isTypeLiteral(schema.ast)) {
-    throw new Error("schema has to describe an object type");
+var createObjectWithDefaults = (ast) => {
+  if (!ast) {
+    return {};
   }
-  SchemaValidator.validateSchema(schema);
-  const _ = Schema15.asserts(schema)(target);
-  makeArraysReactive(target);
-  setSchemaProperties(target, schema);
-};
-var makeArraysReactive = (target) => {
-  for (const key in target) {
-    if (target[symbolIsProxy]) {
-      continue;
-    }
-    if (Array.isArray(target[key])) {
-      target[key] = ReactiveArray.from(target[key]);
-    }
-    if (typeof target[key] === "object") {
-      makeArraysReactive(target[key]);
+  const requiredProps = getRequiredProperties(ast);
+  const obj = {};
+  for (const prop of requiredProps) {
+    const defaultValue = getDefaultValueForType(prop.type);
+    if (defaultValue !== void 0) {
+      obj[prop.name] = defaultValue;
+    } else if (isNestedType(prop.type)) {
+      obj[prop.name] = createObjectWithDefaults(prop.type);
     }
   }
+  return obj;
 };
 
-// src/internal/proxy/make-object.ts
-var makeObject = (objOrSchema, obj, meta) => {
-  if (obj && objOrSchema !== Expando) {
-    return createReactiveObject({
-      ...obj
-    }, meta, objOrSchema);
-  } else if (obj && objOrSchema === Expando) {
-    return createReactiveObject({
-      ...obj
-    }, meta, void 0, {
-      expando: true
+// src/internal/object/snapshot.ts
+import { deepMapValues as deepMapValues3 } from "@dxos/util";
+var copySymbolProperty = (source, target, symbol3, transform) => {
+  let value2;
+  try {
+    value2 = source[symbol3];
+  } catch {
+    return;
+  }
+  if (value2 !== void 0) {
+    const finalValue = transform ? transform(value2) : value2;
+    Object.defineProperty(target, symbol3, {
+      value: finalValue,
+      writable: false,
+      enumerable: false,
+      configurable: false
     });
-  } else {
-    return createReactiveObject(objOrSchema, meta);
   }
 };
-var createReactiveObject = (obj, meta, schema, options) => {
-  if (!isValidProxyTarget2(obj)) {
-    throw new Error("Value cannot be made into a reactive object.");
-  }
-  if (schema) {
-    const annotation = getTypeAnnotation(schema);
-    const shouldGenerateId = options?.expando || !!annotation;
-    if (shouldGenerateId) {
-      setIdOnTarget(obj);
-    }
-    if (annotation) {
-      defineHiddenProperty4(obj, KindId, annotation.kind);
-    }
-    initMeta(obj, meta);
-    prepareTypedTarget(obj, schema);
-    attachTypedJsonSerializer(obj);
-    return createProxy2(obj, TypedReactiveHandler.instance);
-  } else {
-    if (options?.expando) {
-      setIdOnTarget(obj);
+var getSnapshot = (obj) => {
+  const snapshot = deepMapValues3(obj, (value2, recurse) => {
+    if (typeof value2 === "object" && value2 !== null && Object.getPrototypeOf(value2) !== Object.prototype && !Array.isArray(value2)) {
+      return value2;
     }
-    initMeta(obj, meta);
-    return createProxy2(obj, UntypedReactiveHandler.instance);
+    return recurse(value2);
+  });
+  if (obj != null && typeof obj === "object" && KindId in obj) {
+    snapshot[SnapshotKindId] = obj[KindId];
+  }
+  if (obj != null && typeof obj === "object") {
+    const source = obj;
+    copySymbolProperty(source, snapshot, TypeId);
+    copySymbolProperty(source, snapshot, SchemaId);
+    copySymbolProperty(source, snapshot, ObjectDatabaseId);
+    copySymbolProperty(source, snapshot, MetaId, (meta) => ({
+      keys: [
+        ...meta?.keys ?? []
+      ],
+      tags: [
+        ...meta?.tags ?? []
+      ]
+    }));
+    copySymbolProperty(source, snapshot, RelationSourceDXNId);
+    copySymbolProperty(source, snapshot, RelationTargetDXNId);
+    copySymbolProperty(source, snapshot, RelationSourceId);
+    copySymbolProperty(source, snapshot, RelationTargetId);
   }
+  return Object.freeze(snapshot);
 };
-var setIdOnTarget = (target) => {
-  if ("id" in target && target.id !== void 0 && target.id !== null) {
-    if (!ObjectId8.isValid(target.id)) {
-      throw new Error("Invalid object id format.");
+
+// src/internal/object/clone.ts
+import { invariant as invariant17 } from "@dxos/invariant";
+import { deepMapValues as deepMapValues4 } from "@dxos/util";
+var __dxlog_file17 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/object/clone.ts";
+var clone = (obj, opts) => {
+  const { id, ...data } = obj;
+  const schema = getSchema(obj);
+  invariant17(schema != null, "Object should have a schema", {
+    F: __dxlog_file17,
+    L: 21,
+    S: void 0,
+    A: [
+      "schema != null",
+      "'Object should have a schema'"
+    ]
+  });
+  const props = deepMapValues4(data, (value2, recurse) => {
+    if (Ref.isRef(value2)) {
+      if (opts?.deep) {
+        return Ref.make(clone(value2.target, opts));
+      }
+      return value2;
     }
-  } else {
-    target.id = ObjectId8.random();
+    return recurse(value2);
+  });
+  if (opts?.retainId) {
+    props.id = id;
   }
-};
-var initMeta = (obj, meta = {
-  keys: []
-}) => {
-  prepareTypedTarget(meta, ObjectMetaSchema);
-  defineHiddenProperty4(obj, MetaId, createProxy2(meta, TypedReactiveHandler.instance));
+  const meta = deepMapValues4(getMeta(obj), (value2, recurse) => {
+    if (Ref.isRef(value2)) {
+      if (opts?.deep) {
+        return Ref.make(clone(value2.target, opts));
+      }
+      return value2;
+    }
+    return recurse(value2);
+  });
+  return makeObject(schema, props, meta);
 };
 
 // src/internal/schema/echo-schema.ts
-import * as Schema18 from "effect/Schema";
+import * as Schema16 from "effect/Schema";
 import * as SchemaAST11 from "effect/SchemaAST";
-import { invariant as invariant13 } from "@dxos/invariant";
+import { invariant as invariant19 } from "@dxos/invariant";
 
 // src/internal/schema/manipulation.ts
-import * as Schema16 from "effect/Schema";
+import * as Schema14 from "effect/Schema";
 import * as SchemaAST10 from "effect/SchemaAST";
-import { invariant as invariant12 } from "@dxos/invariant";
-import { DXN as DXN8 } from "@dxos/keys";
-var __dxlog_file12 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/manipulation.ts";
+import { invariant as invariant18 } from "@dxos/invariant";
+import { DXN as DXN9 } from "@dxos/keys";
+var __dxlog_file18 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/manipulation.ts";
 var addFieldsToSchema = (schema, fields) => {
-  const schemaExtension = Schema16.partial(Schema16.Struct(fields));
-  return Schema16.extend(schema, schemaExtension).annotations(schema.ast.annotations);
+  const schemaExtension = Schema14.partial(Schema14.Struct(fields));
+  return Schema14.extend(schema, schemaExtension).annotations(schema.ast.annotations);
 };
 var updateFieldsInSchema = (schema, fields) => {
   const ast = schema.ast;
-  invariant12(SchemaAST10.isTypeLiteral(ast), void 0, {
-    F: __dxlog_file12,
+  invariant18(SchemaAST10.isTypeLiteral(ast), void 0, {
+    F: __dxlog_file18,
     L: 29,
     S: void 0,
     A: [
@@ -2463,7 +3374,7 @@ var updateFieldsInSchema = (schema, fields) => {
   const updatedProperties = [
     ...ast.propertySignatures
   ];
-  const propertiesToUpdate = Schema16.partial(Schema16.Struct(fields)).ast.propertySignatures;
+  const propertiesToUpdate = Schema14.partial(Schema14.Struct(fields)).ast.propertySignatures;
   for (const property of propertiesToUpdate) {
     const index = updatedProperties.findIndex((p) => p.name === property.name);
     if (index !== -1) {
@@ -2472,15 +3383,15 @@ var updateFieldsInSchema = (schema, fields) => {
       updatedProperties.push(property);
     }
   }
-  return Schema16.make(new SchemaAST10.TypeLiteral(updatedProperties, ast.indexSignatures, ast.annotations));
+  return Schema14.make(new SchemaAST10.TypeLiteral(updatedProperties, ast.indexSignatures, ast.annotations));
 };
 var removeFieldsFromSchema = (schema, fieldNames) => {
-  return Schema16.make(SchemaAST10.omit(schema.ast, fieldNames)).annotations(schema.ast.annotations);
+  return Schema14.make(SchemaAST10.omit(schema.ast, fieldNames)).annotations(schema.ast.annotations);
 };
 var updateFieldNameInSchema = (schema, { before, after }) => {
   const ast = schema.ast;
-  invariant12(SchemaAST10.isTypeLiteral(ast), void 0, {
-    F: __dxlog_file12,
+  invariant18(SchemaAST10.isTypeLiteral(ast), void 0, {
+    F: __dxlog_file18,
     L: 57,
     S: void 0,
     A: [
@@ -2488,12 +3399,12 @@ var updateFieldNameInSchema = (schema, { before, after }) => {
       ""
     ]
   });
-  return Schema16.make(new SchemaAST10.TypeLiteral(ast.propertySignatures.map((p) => p.name === before ? new SchemaAST10.PropertySignature(after, p.type, p.isOptional, p.isReadonly, p.annotations) : p), ast.indexSignatures, ast.annotations));
+  return Schema14.make(new SchemaAST10.TypeLiteral(ast.propertySignatures.map((p) => p.name === before ? new SchemaAST10.PropertySignature(after, p.type, p.isOptional, p.isReadonly, p.annotations) : p), ast.indexSignatures, ast.annotations));
 };
 var setTypenameInSchema = (schema, typename) => {
   const existingAnnotation = schema.ast.annotations[TypeAnnotationId];
-  invariant12(existingAnnotation, `Missing ${String(TypeAnnotationId)}`, {
-    F: __dxlog_file12,
+  invariant18(existingAnnotation, `Missing ${String(TypeAnnotationId)}`, {
+    F: __dxlog_file18,
     L: 77,
     S: void 0,
     A: [
@@ -2510,51 +3421,37 @@ var setTypenameInSchema = (schema, typename) => {
     },
     [SchemaAST10.JSONSchemaAnnotationId]: {
       ...schema.ast.annotations[SchemaAST10.JSONSchemaAnnotationId] ?? {},
-      $id: schema.ast.annotations[TypeIdentifierAnnotationId] ?? DXN8.fromTypename(typename).toString(),
+      $id: schema.ast.annotations[TypeIdentifierAnnotationId] ?? DXN9.fromTypename(typename).toString(),
       typename
     }
   });
 };
 
 // src/internal/schema/persistent-schema.ts
-import * as Schema17 from "effect/Schema";
-var PersistentEchoSchema = Schema17.Struct({
-  name: Schema17.optional(Schema17.String),
+import * as Schema15 from "effect/Schema";
+var PersistentSchema = Schema15.Struct({
+  name: Schema15.optional(Schema15.String),
   typename: TypenameSchema,
   version: VersionSchema,
   jsonSchema: JsonSchemaType
 }).pipe(EchoObjectSchema({
   typename: "dxos.org/type/Schema",
   version: "0.1.0"
-}));
-var PersistentSchema = PersistentEchoSchema;
-
-// src/internal/schema/snapshot.ts
-var getSnapshot = (object) => {
-  if (typeof object !== "object") {
-    return object;
-  }
-  if (Array.isArray(object)) {
-    return object.map(getSnapshot);
-  }
-  const result = {};
-  for (const key in object) {
-    result[key] = getSnapshot(object[key]);
-  }
-  return result;
-};
+}), LabelAnnotation.set([
+  "name"
+]));
 
 // src/internal/schema/echo-schema.ts
-var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/echo-schema.ts";
+var __dxlog_file19 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/echo-schema.ts";
 var ImmutableSchema = class {
   _schema;
   _objectAnnotation;
   constructor(_schema) {
     this._schema = _schema;
     this._objectAnnotation = getTypeAnnotation(this._schema);
-    invariant13(this._objectAnnotation, void 0, {
-      F: __dxlog_file13,
-      L: 47,
+    invariant19(this._objectAnnotation, void 0, {
+      F: __dxlog_file19,
+      L: 49,
       S: this,
       A: [
         "this._objectAnnotation",
@@ -2565,7 +3462,7 @@ var ImmutableSchema = class {
   //
   // Effect Schema (push to abstract base class).
   //
-  get [Schema18.TypeId]() {
+  get [Schema16.TypeId]() {
     return schemaVariance2;
   }
   get Type() {
@@ -2589,6 +3486,9 @@ var ImmutableSchema = class {
   //
   // TypedObject
   //
+  get kind() {
+    return this._objectAnnotation.kind;
+  }
   get typename() {
     return this._objectAnnotation.typename;
   }
@@ -2615,9 +3515,9 @@ var ImmutableSchema = class {
 var EchoSchemaConstructor = () => {
   return class {
     static get _schema() {
-      return Schema18.Union(PersistentSchema, Schema18.instanceOf(EchoSchema)).annotations(PersistentSchema.ast.annotations);
+      return Schema16.Union(PersistentSchema, Schema16.instanceOf(EchoSchema)).annotations(PersistentSchema.ast.annotations);
     }
-    static [Schema18.TypeId] = schemaVariance2;
+    static [Schema16.TypeId] = schemaVariance2;
     static get ast() {
       const schema = this._schema;
       return schema.ast;
@@ -2644,13 +3544,18 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   _persistentSchema;
   _schema;
   _isDirty = true;
+  /**
+  * Schema kind key that marks this as an ECHO schema.
+  * Makes EchoSchema satisfy the Type.Obj.Any type.
+  */
+  [SchemaKindId] = EntityKind.Object;
   constructor(_persistentSchema) {
     super(), this._persistentSchema = _persistentSchema;
   }
   //
   // Effect Schema (push to abstract base class).
   //
-  get [Schema18.TypeId]() {
+  get [Schema16.TypeId]() {
     return schemaVariance2;
   }
   get Type() {
@@ -2678,6 +3583,9 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   //
   // BaseSchema
   //
+  get kind() {
+    return EntityKind.Object;
+  }
   get typename() {
     return this._persistentSchema.typename;
   }
@@ -2694,7 +3602,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
     return this._getSchema();
   }
   /**
-  * @reactive
+  * Returns the JSON schema for the schema.
   */
   get jsonSchema() {
     return this._persistentSchema.jsonSchema;
@@ -2703,9 +3611,9 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   * Returns a mutable schema.
   */
   get mutable() {
-    invariant13(!this.readonly, "Schema is not mutable", {
-      F: __dxlog_file13,
-      L: 262,
+    invariant19(!this.readonly, "Schema is not mutable", {
+      F: __dxlog_file19,
+      L: 279,
       S: this,
       A: [
         "!this.readonly",
@@ -2744,9 +3652,9 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   }
   getProperties() {
     const ast = this._getSchema().ast;
-    invariant13(SchemaAST11.isTypeLiteral(ast), void 0, {
-      F: __dxlog_file13,
-      L: 297,
+    invariant19(SchemaAST11.isTypeLiteral(ast), void 0, {
+      F: __dxlog_file19,
+      L: 314,
       S: this,
       A: [
         "SchemaAST.isTypeLiteral(ast)",
@@ -2767,22 +3675,28 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   */
   updateTypename(typename) {
     const updated = setTypenameInSchema(this._getSchema(), typename);
-    this._persistentSchema.typename = typename;
-    this._persistentSchema.jsonSchema = toJsonSchema(updated);
+    this._change((schema) => {
+      schema.typename = typename;
+      schema.jsonSchema = toJsonSchema(updated);
+    });
   }
   /**
   * @throws Error if the schema is readonly.
   */
   addFields(fields) {
     const extended = addFieldsToSchema(this._getSchema(), fields);
-    this._persistentSchema.jsonSchema = toJsonSchema(extended);
+    this._change((schema) => {
+      schema.jsonSchema = toJsonSchema(extended);
+    });
   }
   /**
   * @throws Error if the schema is readonly.
   */
   updateFields(fields) {
     const updated = updateFieldsInSchema(this._getSchema(), fields);
-    this._persistentSchema.jsonSchema = toJsonSchema(updated);
+    this._change((schema) => {
+      schema.jsonSchema = toJsonSchema(updated);
+    });
   }
   /**
   * @throws Error if the schema is readonly.
@@ -2792,14 +3706,29 @@ var EchoSchema = class extends EchoSchemaConstructor() {
       before,
       after
     });
-    this._persistentSchema.jsonSchema = toJsonSchema(renamed);
+    this._change((schema) => {
+      schema.jsonSchema = toJsonSchema(renamed);
+    });
   }
   /**
   * @throws Error if the schema is readonly.
   */
   removeFields(fieldNames) {
     const removed = removeFieldsFromSchema(this._getSchema(), fieldNames);
-    this._persistentSchema.jsonSchema = toJsonSchema(removed);
+    this._change((schema) => {
+      schema.jsonSchema = toJsonSchema(removed);
+    });
+  }
+  /**
+  * Wrapper for Obj.change that handles the change context for the persistent schema.
+  */
+  _change(callback) {
+    const changeFn = this._persistentSchema[ChangeId];
+    if (changeFn) {
+      changeFn(callback);
+    } else {
+      callback(this._persistentSchema);
+    }
   }
   //
   // Internals
@@ -2840,14 +3769,15 @@ export {
   MetaId,
   ObjectMetaSchema,
   getMeta,
-  splitMeta,
   foreignKey,
   foreignKeyEquals,
   compareForeignKeys,
   VersionTypeId,
-  EchoObjectSchema,
-  EXPANDO_TYPENAME,
-  Expando,
+  getLabel,
+  setLabel,
+  getDescription,
+  setDescription,
+  makeEchoTypeSchema,
   ATTR_RELATION_SOURCE,
   RelationSourceId,
   RelationSourceDXNId,
@@ -2860,8 +3790,27 @@ export {
   ATTR_DELETED,
   ObjectDeletedId,
   ObjectVersionId,
+  ObjectDatabaseId,
   assertObjectModel,
+  EchoObjectSchema,
   getObjectDXN,
+  getDXN,
+  getDatabase,
+  getMetaChecked,
+  getKeys,
+  deleteKeys,
+  addTag,
+  removeTag,
+  compare,
+  sortByLabel,
+  sortByTypename,
+  sort,
+  isVersion,
+  version,
+  versionValid,
+  compareVersions,
+  encodeVersion,
+  decodeVersion,
   CustomAnnotations,
   DecodedAnnotations,
   EchoAnnotations,
@@ -2892,33 +3841,65 @@ export {
   toJsonSchema,
   toEffectSchema,
   makeTypedEntityClass,
-  objectToJSON,
-  objectFromJSON,
-  setRefResolverOnData,
+  EventId,
+  ChangeId,
+  batchEvents,
+  emitEvent,
+  enterChangeContext,
+  isInChangeContext,
+  queueNotification,
+  queueOwnerNotification,
+  hasPendingNotifications,
+  clearPendingNotifications,
+  executeChange,
+  defineHiddenProperty,
+  MutationOutsideChangeContextError,
+  createPropertySetError,
+  createPropertyDeleteError,
+  createArrayMethodError,
   attachTypedJsonSerializer,
-  createObject,
-  isDeleted,
-  createQueueDXN,
+  typedJsonSerializer,
+  symbolIsProxy,
+  isProxy,
+  isValidProxyTarget,
+  getProxySlot,
+  getProxyTarget,
+  getProxyHandler,
+  dangerouslySetProxyId,
+  createProxy,
+  setMetaOwner,
+  getEchoRoot,
+  objectData,
+  ReactiveArray,
   SchemaValidator,
   checkIdNotPresentOnSchema,
-  TypedObject,
   TypedReactiveHandler,
   prepareTypedTarget,
   makeObject,
+  subscribe,
+  change,
+  objectToJSON,
+  objectFromJSON,
+  setRefResolverOnData,
+  objectStructureToJson,
+  createObject,
+  isDeleted,
+  createQueueDXN,
+  setValue,
+  getSnapshot,
+  clone,
   addFieldsToSchema,
   updateFieldsInSchema,
   removeFieldsFromSchema,
   updateFieldNameInSchema,
   setTypenameInSchema,
   PersistentSchema,
-  getSnapshot,
   ImmutableSchema,
   isMutable,
   EchoSchema,
   JsonPath2 as JsonPath,
   JsonProp,
   getValue,
-  setValue,
   splitJsonPath
 };
-//# sourceMappingURL=chunk-6XVZF5VJ.mjs.map
+//# sourceMappingURL=chunk-VJ2H5MOJ.mjs.map