@dxos/echo-query 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/dist/query-lite/index.d.ts

@@ -1,6 +1,5 @@
-import { InspectOptionsStylized, inspect } from "node:util";
-import "protobufjs";
-import "@dxos/log";
+import { inspect } from "node:util";
+import { CallMetadata } from "@dxos/log";
 
 //#region rolldown:runtime
 
@@ -4711,7 +4710,7 @@ declare namespace FastCheck_d_exports {
   export { Arbitrary, ArrayConstraints$1 as ArrayConstraints, AsyncCommand, AsyncPropertyHookFunction, BigIntArrayConstraints, BigIntConstraints$1 as BigIntConstraints, BigUintConstraints, CloneValue, Command, CommandsContraints, ContextValue, DateConstraints$1 as DateConstraints, DepthContext, DepthIdentifier, DepthSize, DictionaryConstraints, DomainConstraints, DoubleConstraints, EmailAddressConstraints, ExecutionStatus, ExecutionTree, FalsyContraints, FalsyValue, Float32ArrayConstraints, Float64ArrayConstraints, FloatConstraints, GeneratorValue, GlobalAsyncPropertyHookFunction, GlobalParameters, GlobalPropertyHookFunction, IAsyncProperty, IAsyncPropertyWithHooks, ICommand, IProperty, IPropertyWithHooks, IRawProperty, IntArrayConstraints, IntegerConstraints, JsonSharedConstraints, JsonValue, LetrecLooselyTypedBuilder, LetrecLooselyTypedTie, LetrecTypedBuilder, LetrecTypedTie, LetrecValue, LoremConstraints, MaybeWeightedArbitrary, Memo, MixedCaseConstraints, ModelRunAsyncSetup, ModelRunSetup, NatConstraints, ObjectConstraints, OneOfConstraints, OneOfValue, OptionConstraints, Parameters$1 as Parameters, PreconditionFailure, PropertyFailure, PropertyHookFunction, Random, RandomType, RecordConstraints, RecordValue, RunDetails, RunDetailsCommon, RunDetailsFailureInterrupted, RunDetailsFailureProperty, RunDetailsFailureTooManySkips, RunDetailsSuccess, Scheduler, SchedulerAct, SchedulerConstraints, SchedulerReportItem, SchedulerSequenceItem, ShuffledSubarrayConstraints, Size, SizeForArbitrary, SparseArrayConstraints, Stream$1 as Stream, StringConstraints$1 as StringConstraints, StringMatchingConstraints, StringSharedConstraints, SubarrayConstraints, UnicodeJsonSharedConstraints, UniqueArrayConstraints, UniqueArrayConstraintsCustomCompare, UniqueArrayConstraintsCustomCompareSelect, UniqueArrayConstraintsRecommended, UniqueArraySharedConstraints, UuidConstraints, Value$1 as Value, VerbosityLevel, WebAuthorityConstraints, WebFragmentsConstraints, WebPathConstraints, WebQueryParametersConstraints, WebSegmentConstraints, WebUrlConstraints, WeightedArbitrary, WithAsyncToStringMethod, WithCloneMethod, WithToStringMethod, __commitHash, __type, __version, anything, array, ascii, asciiString, assert, asyncDefaultReportMessage, asyncModelRun, asyncProperty, asyncStringify, asyncToStringMethod, base64, base64String, bigInt, bigInt64Array, bigIntN, bigUint, bigUint64Array, bigUintN, boolean, char, char16bits, check, clone, cloneIfNeeded, cloneMethod, commands, compareBooleanFunc, compareFunc, configureGlobal, constant, constantFrom, context, createDepthIdentifier, date, defaultReportMessage, dictionary, domain, double, emailAddress, falsy, float, float32Array, float64Array, fullUnicode, fullUnicodeString, func, gen, getDepthContextFor, hasAsyncToStringMethod, hasCloneMethod, hasToStringMethod, hash, hexa, hexaString, infiniteStream, int16Array, int32Array, int8Array, integer, ipV4, ipV4Extended, ipV6, json, jsonValue, letrec, limitShrink, lorem, mapToConstant, maxSafeInteger, maxSafeNat, memo, mixedCase, modelRun, nat, noBias, noShrink, object, oneof, option, pre, property$1 as property, readConfigureGlobal, record, resetConfigureGlobal, sample, scheduledModelRun, scheduler, schedulerFor, shuffledSubarray, sparseArray, statistics, stream, string, string16bits, stringMatching, stringOf, stringify, subarray, toStringMethod, tuple, uint16Array, uint32Array, uint8Array, uint8ClampedArray, ulid, unicode, unicodeJson, unicodeJsonValue, unicodeString, uniqueArray, uuid, uuidV, webAuthority, webFragments, webPath, webQueryParameters, webSegment, webUrl };
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Arbitrary.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Arbitrary.d.ts
 /**
  * @category model
  * @since 3.10.0
@@ -4756,7 +4755,7 @@ interface DateConstraints {
   readonly constraints: DateConstraints$1;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Types.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Types.d.ts
 /**
  * A utility type that transforms a union type `T` into an intersection type.
  *
@@ -4846,12 +4845,8 @@ declare namespace Contravariant {
    */
   type Type<A$1> = A$1 extends Contravariant<infer U> ? U : never;
 }
-/**
- * @since 3.9.0
- */
-type NoExcessProperties<T$1, U$1> = T$1 & { readonly [K in Exclude<keyof U$1, keyof T$1>]: never };
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Equivalence.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Equivalence.d.ts
 /**
  * @category type class
  * @since 2.0.0
@@ -4860,7 +4855,7 @@ interface Equivalence<in A$1> {
   (self: A$1, that: A$1): boolean;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Hash.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Hash.d.ts
 /**
  * @since 2.0.0
  * @category models
@@ -4869,7 +4864,7 @@ interface Hash {
   [symbol](): number;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Equal.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Equal.d.ts
 /**
  * @since 2.0.0
  * @category models
@@ -4878,7 +4873,7 @@ interface Equal extends Hash {
   [symbol](that: Equal): boolean;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Pipeable.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Pipeable.d.ts
 /**
  * @since 2.0.0
  * @category Models
@@ -4908,7 +4903,7 @@ interface Pipeable {
   pipe<A$1, B$1 = never, C = never, D = never, E$1 = never, F = never, G = never, H$1 = never, I$1 = never, J = never, K$1 = never, L$1 = never, M = never, N = never, O = never, P$1 = never, Q = never, R$1 = never, S$1 = never, T$1 = never, U$1 = never>(this: A$1, ab: (_: A$1) => B$1, bc: (_: B$1) => C, cd: (_: C) => D, de: (_: D) => E$1, ef: (_: E$1) => F, fg: (_: F) => G, gh: (_: G) => H$1, hi: (_: H$1) => I$1, ij: (_: I$1) => J, jk: (_: J) => K$1, kl: (_: K$1) => L$1, lm: (_: L$1) => M, mn: (_: M) => N, no: (_: N) => O, op: (_: O) => P$1, pq: (_: P$1) => Q, qr: (_: Q) => R$1, rs: (_: R$1) => S$1, st: (_: S$1) => T$1, tu: (_: T$1) => U$1): U$1;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Unify.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Unify.d.ts
 /**
  * @since 2.0.0
  */
@@ -4937,7 +4932,7 @@ declare const ignoreSymbol: unique symbol;
  */
 type ignoreSymbol = typeof ignoreSymbol;
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Utils.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Utils.d.ts
 /**
  * @since 3.0.6
  */
@@ -4954,7 +4949,7 @@ declare class YieldWrap<T$1> {
   [YieldWrapTypeId](): T$1;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Option.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Option.d.ts
 /**
  * The `Option` data type represents optional values. An `Option<A>` can either
  * be `Some<A>`, containing a value of type `A`, or `None`, representing the
@@ -4978,12 +4973,12 @@ type Option<A$1> = None$1<A$1> | Some$1<A$1>;
  * @category Symbols
  * @since 2.0.0
  */
-declare const TypeId$4: unique symbol;
+declare const TypeId$5: unique symbol;
 /**
  * @category Symbols
  * @since 2.0.0
  */
-type TypeId$4 = typeof TypeId$4;
+type TypeId$5 = typeof TypeId$5;
 /**
  * @category Models
  * @since 2.0.0
@@ -4991,7 +4986,7 @@ type TypeId$4 = typeof TypeId$4;
 interface None$1<out A$1> extends Pipeable, Inspectable {
   readonly _tag: "None";
   readonly _op: "None";
-  readonly [TypeId$4]: {
+  readonly [TypeId$5]: {
     readonly _A: Covariant<A$1>;
   };
   [typeSymbol]?: unknown;
@@ -5006,7 +5001,7 @@ interface Some$1<out A$1> extends Pipeable, Inspectable {
   readonly _tag: "Some";
   readonly _op: "Some";
   readonly value: A$1;
-  readonly [TypeId$4]: {
+  readonly [TypeId$5]: {
     readonly _A: Covariant<A$1>;
   };
   [typeSymbol]?: unknown;
@@ -5055,7 +5050,7 @@ declare namespace Option {
  */
 interface OptionUnifyIgnore {}
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Context.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Context.d.ts
 /**
  * @since 2.0.0
  * @category symbol
@@ -5079,7 +5074,7 @@ interface Tag$2<in out Id$1, in out Value$2> extends Pipeable, Inspectable, Read
     readonly _Identifier: Invariant<Id$1>;
   };
   of(self: Value$2): Value$2;
-  context(self: Value$2): Context$1<Id$1>;
+  context(self: Value$2): Context$2<Id$1>;
   readonly stack?: string | undefined;
   readonly key: string;
   [typeSymbol]?: unknown;
@@ -5090,7 +5085,7 @@ interface Tag$2<in out Id$1, in out Value$2> extends Pipeable, Inspectable, Read
  * @since 3.5.9
  * @category models
  */
-interface ReadonlyTag<in out Id$1, out Value$2> extends Pipeable, Inspectable, Effect<Value$2, never, Id$1> {
+interface ReadonlyTag<in out Id$1, out Value$2> extends Pipeable, Inspectable, Effect$1<Value$2, never, Id$1> {
   readonly _op: "Tag";
   readonly Service: Value$2;
   readonly Identifier: Id$1;
@@ -5114,8 +5109,8 @@ interface TagClassShape<Id$1, Shape> {
  * @since 2.0.0
  * @category models
  */
-interface TagClass<Self, Id$1 extends string, Type$5> extends Tag$2<Self, Type$5> {
-  new (_: never): TagClassShape<Id$1, Type$5>;
+interface TagClass<Self, Id$1 extends string, Type$6> extends Tag$2<Self, Type$6> {
+  new (_: never): TagClassShape<Id$1, Type$6>;
   readonly key: Id$1;
 }
 /**
@@ -5145,18 +5140,18 @@ declare namespace Tag$2 {
    */
   type Identifier<T$1 extends Tag$2<any, any> | TagClassShape<any, any>> = T$1 extends Tag$2<any, any> ? T$1["Identifier"] : T$1 extends TagClassShape<any, any> ? T$1 : never;
 }
-declare const TypeId$3: unique symbol;
+declare const TypeId$4: unique symbol;
 /**
  * @since 2.0.0
  * @category symbol
  */
-type TypeId$3 = typeof TypeId$3;
+type TypeId$4 = typeof TypeId$4;
 /**
  * @since 2.0.0
  * @category models
  */
-interface Context$1<in Services> extends Equal, Pipeable, Inspectable {
-  readonly [TypeId$3]: {
+interface Context$2<in Services> extends Equal, Pipeable, Inspectable {
+  readonly [TypeId$4]: {
     readonly _Services: Contravariant<Services>;
   };
   readonly unsafeMap: Map<string, any>;
@@ -5180,7 +5175,7 @@ interface Context$1<in Services> extends Equal, Pipeable, Inspectable {
  */
 declare const Tag$2: <const Id$1 extends string>(id: Id$1) => <Self, Shape>() => TagClass<Self, Id$1, Shape>;
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Sink.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Sink.d.ts
 /**
  * @since 2.0.0
  * @category symbols
@@ -5236,7 +5231,7 @@ declare namespace Sink {
   }
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/STM.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/STM.d.ts
 /**
  * @since 2.0.0
  * @category symbols
@@ -5284,7 +5279,7 @@ type STMTypeId = typeof STMTypeId;
  * @since 2.0.0
  * @category models
  */
-interface STM<out A$1, out E$1 = never, out R$1 = never> extends Effect<A$1, E$1, R$1>, STM.Variance<A$1, E$1, R$1>, Pipeable {
+interface STM<out A$1, out E$1 = never, out R$1 = never> extends Effect$1<A$1, E$1, R$1>, STM.Variance<A$1, E$1, R$1>, Pipeable {
   [typeSymbol]?: unknown;
   [unifySymbol]?: STMUnify<this>;
   [ignoreSymbol]?: STMUnifyIgnore;
@@ -5355,7 +5350,7 @@ declare namespace STM {
   }
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Stream.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Stream.d.ts
 /**
  * @since 2.0.0
  * @category symbols
@@ -5468,7 +5463,7 @@ declare namespace Stream {
   type DynamicTupleOf<T$1, N extends number, R$1 extends Array<unknown>> = R$1["length"] extends N ? R$1 : DynamicTupleOf<T$1, N, [T$1, ...R$1]>;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Channel.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Channel.d.ts
 /**
  * @since 2.0.0
  * @category symbols
@@ -5562,7 +5557,7 @@ declare namespace Channel {
   }
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Cause.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Cause.d.ts
 /**
  * A unique symbol identifying the `NoSuchElementException` type.
  *
@@ -5610,11 +5605,11 @@ type UnknownExceptionTypeId = typeof UnknownExceptionTypeId;
  * @category Models
  */
 interface YieldableError extends Pipeable, Inspectable, Error {
-  readonly [EffectTypeId]: Effect.VarianceStruct<never, this, never>;
+  readonly [EffectTypeId]: Effect$1.VarianceStruct<never, this, never>;
   readonly [StreamTypeId]: Stream.VarianceStruct<never, this, never>;
   readonly [SinkTypeId]: Sink.VarianceStruct<never, unknown, never, this, never>;
   readonly [ChannelTypeId]: Channel.VarianceStruct<never, unknown, this, unknown, never, unknown, never>;
-  [Symbol.iterator](): EffectGenerator<Effect<never, this, never>>;
+  [Symbol.iterator](): EffectGenerator<Effect$1<never, this, never>>;
 }
 /**
  * Creates an error that occurs at runtime, extendable for other exception
@@ -5702,7 +5697,7 @@ declare const NoSuchElementException: new (message?: string | undefined) => NoSu
  */
 declare const UnknownException: new (error: unknown, message?: string | undefined) => UnknownException;
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Effect.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Effect.d.ts
 /**
  * @since 2.0.0
  * @category Symbols
@@ -5735,18 +5730,18 @@ type EffectTypeId = typeof EffectTypeId;
  * @since 2.0.0
  * @category Models
  */
-interface Effect<out A$1, out E$1 = never, out R$1 = never> extends Effect.Variance<A$1, E$1, R$1>, Pipeable {
+interface Effect$1<out A$1, out E$1 = never, out R$1 = never> extends Effect$1.Variance<A$1, E$1, R$1>, Pipeable {
   readonly [typeSymbol]?: unknown;
   readonly [unifySymbol]?: EffectUnify<this>;
   readonly [ignoreSymbol]?: EffectUnifyIgnore;
-  [Symbol.iterator](): EffectGenerator<Effect<A$1, E$1, R$1>>;
+  [Symbol.iterator](): EffectGenerator<Effect$1<A$1, E$1, R$1>>;
 }
 /**
  * @since 3.0.0
  * @category Models
  */
-interface EffectGenerator<T$1 extends Effect<any, any, any>> {
-  next(...args: ReadonlyArray<any>): IteratorResult<YieldWrap<T$1>, Effect.Success<T$1>>;
+interface EffectGenerator<T$1 extends Effect$1<any, any, any>> {
+  next(...args: ReadonlyArray<any>): IteratorResult<YieldWrap<T$1>, Effect$1.Success<T$1>>;
 }
 /**
  * @since 2.0.0
@@ -5755,7 +5750,7 @@ interface EffectGenerator<T$1 extends Effect<any, any, any>> {
 interface EffectUnify<A$1 extends {
   [typeSymbol]?: any;
 }> extends EitherUnify<A$1>, OptionUnify<A$1>, TagUnify<A$1> {
-  Effect?: () => A$1[typeSymbol] extends Effect<infer A0, infer E0, infer R0> | infer _ ? Effect<A0, E0, R0> : never;
+  Effect?: () => A$1[typeSymbol] extends Effect$1<infer A0, infer E0, infer R0> | infer _ ? Effect$1<A0, E0, R0> : never;
 }
 /**
  * @category Models
@@ -5771,10 +5766,10 @@ interface EffectUnifyIgnore {
  * @category Models
  */
 declare module "./Context.js" {
-  interface Tag<Id$1, Value$2> extends Effect<Value$2, never, Id$1> {
+  interface Tag<Id$1, Value$2> extends Effect$1<Value$2, never, Id$1> {
     [Symbol.iterator](): EffectGenerator<Tag$1<Id$1, Value$2>>;
   }
-  interface Reference<Id$1, Value$2> extends Effect<Value$2> {
+  interface Reference<Id$1, Value$2> extends Effect$1<Value$2> {
     [Symbol.iterator](): EffectGenerator<Reference<Id$1, Value$2>>;
   }
   interface TagUnifyIgnore {
@@ -5788,11 +5783,11 @@ declare module "./Context.js" {
  * @category Models
  */
 declare module "./Either.js" {
-  interface Left<E$1, A$1> extends Effect<A$1, E$1> {
+  interface Left<E$1, A$1> extends Effect$1<A$1, E$1> {
     readonly _tag: "Left";
     [Symbol.iterator](): EffectGenerator<Left<E$1, A$1>>;
   }
-  interface Right<E$1, A$1> extends Effect<A$1, E$1> {
+  interface Right<E$1, A$1> extends Effect$1<A$1, E$1> {
     readonly _tag: "Right";
     [Symbol.iterator](): EffectGenerator<Right<E$1, A$1>>;
   }
@@ -5807,11 +5802,11 @@ declare module "./Either.js" {
  * @category Models
  */
 declare module "./Option.js" {
-  interface None<A$1> extends Effect<A$1, NoSuchElementException> {
+  interface None<A$1> extends Effect$1<A$1, NoSuchElementException> {
     readonly _tag: "None";
     [Symbol.iterator](): EffectGenerator<None<A$1>>;
   }
-  interface Some<A$1> extends Effect<A$1, NoSuchElementException> {
+  interface Some<A$1> extends Effect$1<A$1, NoSuchElementException> {
     readonly _tag: "Some";
     [Symbol.iterator](): EffectGenerator<Some<A$1>>;
   }
@@ -5824,7 +5819,7 @@ declare module "./Option.js" {
 /**
  * @since 2.0.0
  */
-declare namespace Effect {
+declare namespace Effect$1 {
   /**
    * @since 2.0.0
    * @category Models
@@ -5846,22 +5841,22 @@ declare namespace Effect {
    * @since 2.0.0
    * @category Effect Type Extractors
    */
-  type Context<T$1 extends Effect<any, any, any>> = [T$1] extends [Effect<infer _A, infer _E, infer _R>] ? _R : never;
+  type Context<T$1 extends Effect$1<any, any, any>> = [T$1] extends [Effect$1<infer _A, infer _E, infer _R>] ? _R : never;
   /**
    * @since 2.0.0
    * @category Effect Type Extractors
    */
-  type Error<T$1 extends Effect<any, any, any>> = [T$1] extends [Effect<infer _A, infer _E, infer _R>] ? _E : never;
+  type Error<T$1 extends Effect$1<any, any, any>> = [T$1] extends [Effect$1<infer _A, infer _E, infer _R>] ? _E : never;
   /**
    * @since 2.0.0
    * @category Effect Type Extractors
    */
-  type Success<T$1 extends Effect<any, any, any>> = [T$1] extends [Effect<infer _A, infer _E, infer _R>] ? _A : never;
+  type Success<T$1 extends Effect$1<any, any, any>> = [T$1] extends [Effect$1<infer _A, infer _E, infer _R>] ? _A : never;
   /**
    * @since 3.15.5
    * @category Effect Type Extractors
    */
-  type AsEffect<T$1 extends Effect<any, any, any>> = Effect<T$1 extends Effect<infer _A, infer _E, infer _R> ? _A : never, T$1 extends Effect<infer _A, infer _E, infer _R> ? _E : never, T$1 extends Effect<infer _A, infer _E, infer _R> ? _R : never> extends infer Q ? Q : never;
+  type AsEffect<T$1 extends Effect$1<any, any, any>> = Effect$1<T$1 extends Effect$1<infer _A, infer _E, infer _R> ? _A : never, T$1 extends Effect$1<infer _A, infer _E, infer _R> ? _E : never, T$1 extends Effect$1<infer _A, infer _E, infer _R> ? _R : never> extends infer Q ? Q : never;
 }
 /**
  * @since 2.0.0
@@ -5893,7 +5888,7 @@ declare namespace Tag$1 {
    * @since 3.9.0
    * @category Models
    */
-  type Proxy<Self, Type$5> = { [k in keyof Type$5 as Type$5[k] extends ((...args: infer Args extends ReadonlyArray<any>) => infer Ret) ? ((...args: Readonly<Args>) => Ret) extends Type$5[k] ? k : never : k]: Type$5[k] extends ((...args: infer Args extends ReadonlyArray<any>) => Effect<infer A, infer E, infer R>) ? (...args: Readonly<Args>) => Effect<A, E, Self | R> : Type$5[k] extends ((...args: infer Args extends ReadonlyArray<any>) => Promise<infer A>) ? (...args: Readonly<Args>) => Effect<A, UnknownException, Self> : Type$5[k] extends ((...args: infer Args extends ReadonlyArray<any>) => infer A) ? (...args: Readonly<Args>) => Effect<A, never, Self> : Type$5[k] extends Effect<infer A, infer E, infer R> ? Effect<A, E, Self | R> : Effect<Type$5[k], never, Self> };
+  type Proxy<Self, Type$6> = { [k in keyof Type$6 as Type$6[k] extends ((...args: infer Args extends ReadonlyArray<any>) => infer Ret) ? ((...args: Readonly<Args>) => Ret) extends Type$6[k] ? k : never : k]: Type$6[k] extends ((...args: infer Args extends ReadonlyArray<any>) => Effect$1<infer A, infer E, infer R>) ? (...args: Readonly<Args>) => Effect$1<A, E, Self | R> : Type$6[k] extends ((...args: infer Args extends ReadonlyArray<any>) => Promise<infer A>) ? (...args: Readonly<Args>) => Effect$1<A, UnknownException, Self> : Type$6[k] extends ((...args: infer Args extends ReadonlyArray<any>) => infer A) ? (...args: Readonly<Args>) => Effect$1<A, never, Self> : Type$6[k] extends Effect$1<infer A, infer E, infer R> ? Effect$1<A, E, Self | R> : Effect$1<Type$6[k], never, Self> };
 }
 /**
  * Creates a unique tag for a dependency, embedding the service's methods as
@@ -5928,11 +5923,11 @@ declare namespace Tag$1 {
  * @since 2.0.0
  * @category Context
  */
-declare const Tag$1: <const Id$1 extends string>(id: Id$1) => <Self, Type$5 extends Tag$1.AllowedType>() => TagClass<Self, Id$1, Type$5> & (Type$5 extends Record<PropertyKey, any> ? Tag$1.Proxy<Self, Type$5> : {}) & {
-  use: <X>(body: (_: Type$5) => X) => [X] extends [Effect<infer A, infer E, infer R>] ? Effect<A, E, R | Self> : [X] extends [PromiseLike<infer A>] ? Effect<A, UnknownException, Self> : Effect<X, never, Self>;
+declare const Tag$1: <const Id$1 extends string>(id: Id$1) => <Self, Type$6 extends Tag$1.AllowedType>() => TagClass<Self, Id$1, Type$6> & (Type$6 extends Record<PropertyKey, any> ? Tag$1.Proxy<Self, Type$6> : {}) & {
+  use: <X>(body: (_: Type$6) => X) => [X] extends [Effect$1<infer A, infer E, infer R>] ? Effect$1<A, E, R | Self> : [X] extends [PromiseLike<infer A>] ? Effect$1<A, UnknownException, Self> : Effect$1<X, never, Self>;
 };
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Inspectable.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Inspectable.d.ts
 /**
  * @since 2.0.0
  * @category models
@@ -5943,7 +5938,7 @@ interface Inspectable {
   [NodeInspectSymbol](): unknown;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Either.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Either.d.ts
 /**
  * @category models
  * @since 2.0.0
@@ -5953,12 +5948,12 @@ type Either<A$1, E$1 = never> = Left$1<E$1, A$1> | Right$1<E$1, A$1>;
  * @category symbols
  * @since 2.0.0
  */
-declare const TypeId$2: unique symbol;
+declare const TypeId$3: unique symbol;
 /**
  * @category symbols
  * @since 2.0.0
  */
-type TypeId$2 = typeof TypeId$2;
+type TypeId$3 = typeof TypeId$3;
 /**
  * @category models
  * @since 2.0.0
@@ -5967,7 +5962,7 @@ interface Left$1<out E$1, out A$1> extends Pipeable, Inspectable {
   readonly _tag: "Left";
   readonly _op: "Left";
   readonly left: E$1;
-  readonly [TypeId$2]: {
+  readonly [TypeId$3]: {
     readonly _R: Covariant<A$1>;
     readonly _L: Covariant<E$1>;
   };
@@ -5983,7 +5978,7 @@ interface Right$1<out E$1, out A$1> extends Pipeable, Inspectable {
   readonly _tag: "Right";
   readonly _op: "Right";
   readonly right: A$1;
-  readonly [TypeId$2]: {
+  readonly [TypeId$3]: {
     readonly _R: Covariant<A$1>;
     readonly _L: Covariant<E$1>;
   };
@@ -6021,7 +6016,7 @@ declare namespace Either {
   type Right<T$1 extends Either<any, any>> = [T$1] extends [Either<infer _A, infer _E>] ? _A : never;
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Array.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Array.d.ts
 /**
  * @category models
  * @since 2.0.0
@@ -6033,7 +6028,7 @@ type NonEmptyReadonlyArray<A$1> = readonly [A$1, ...Array<A$1>];
  */
 type NonEmptyArray<A$1> = [A$1, ...Array<A$1>];
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/SchemaAST.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/SchemaAST.d.ts
 /**
  * @category model
  * @since 3.10.0
@@ -6057,15 +6052,15 @@ type SchemaIdAnnotation = string | symbol;
  * @category annotations
  * @since 3.10.0
  */
-type MessageAnnotation = (issue: ParseIssue) => string | Effect<string> | {
-  readonly message: string | Effect<string>;
+type MessageAnnotation = (issue: ParseIssue) => string | Effect$1<string> | {
+  readonly message: string | Effect$1<string>;
   readonly override: boolean;
 };
 /**
  * @category annotations
  * @since 3.10.0
  */
-type MissingMessageAnnotation = () => string | Effect<string>;
+type MissingMessageAnnotation = () => string | Effect$1<string>;
 /**
  * @category annotations
  * @since 3.10.0
@@ -6125,7 +6120,7 @@ type ParseIssueTitleAnnotation = (issue: ParseIssue) => string | undefined;
  * @category annotations
  * @since 3.10.0
  */
-type DecodingFallbackAnnotation<A$1> = (issue: ParseIssue) => Effect<A$1, ParseIssue>;
+type DecodingFallbackAnnotation<A$1> = (issue: ParseIssue) => Effect$1<A$1, ParseIssue>;
 /**
  * @category annotations
  * @since 3.10.0
@@ -6147,14 +6142,14 @@ interface Annotated {
  */
 declare class Declaration implements Annotated {
   readonly typeParameters: ReadonlyArray<AST>;
-  readonly decodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect<any, ParseIssue, any>;
-  readonly encodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect<any, ParseIssue, any>;
+  readonly decodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect$1<any, ParseIssue, any>;
+  readonly encodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect$1<any, ParseIssue, any>;
   readonly annotations: Annotations$1;
   /**
    * @since 3.10.0
    */
   readonly _tag = "Declaration";
-  constructor(typeParameters: ReadonlyArray<AST>, decodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect<any, ParseIssue, any>, encodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect<any, ParseIssue, any>, annotations?: Annotations$1);
+  constructor(typeParameters: ReadonlyArray<AST>, decodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect$1<any, ParseIssue, any>, encodeUnknown: (...typeParameters: ReadonlyArray<AST>) => (input: unknown, options: ParseOptions, self: Declaration) => Effect$1<any, ParseIssue, any>, annotations?: Annotations$1);
   /**
    * @since 3.10.0
    */
@@ -6500,7 +6495,7 @@ declare class TemplateLiteral implements Annotated {
  * @category model
  * @since 3.10.0
  */
-declare class Type$4 implements Annotated {
+declare class Type$5 implements Annotated {
   readonly type: AST;
   readonly annotations: Annotations$1;
   constructor(type: AST, annotations?: Annotations$1);
@@ -6517,7 +6512,7 @@ declare class Type$4 implements Annotated {
  * @category model
  * @since 3.10.0
  */
-declare class OptionalType extends Type$4 {
+declare class OptionalType extends Type$5 {
   readonly isOptional: boolean;
   constructor(type: AST, isOptional: boolean, annotations?: Annotations$1);
   /**
@@ -6535,14 +6530,14 @@ declare class OptionalType extends Type$4 {
  */
 declare class TupleType$1 implements Annotated {
   readonly elements: ReadonlyArray<OptionalType>;
-  readonly rest: ReadonlyArray<Type$4>;
+  readonly rest: ReadonlyArray<Type$5>;
   readonly isReadonly: boolean;
   readonly annotations: Annotations$1;
   /**
    * @since 3.10.0
    */
   readonly _tag = "TupleType";
-  constructor(elements: ReadonlyArray<OptionalType>, rest: ReadonlyArray<Type$4>, isReadonly: boolean, annotations?: Annotations$1);
+  constructor(elements: ReadonlyArray<OptionalType>, rest: ReadonlyArray<Type$5>, isReadonly: boolean, annotations?: Annotations$1);
   /**
    * @since 3.10.0
    */
@@ -6793,13 +6788,13 @@ type TransformationKind = FinalTransformation | ComposeTransformation | TypeLite
  * @since 3.10.0
  */
 declare class FinalTransformation {
-  readonly decode: (fromA: any, options: ParseOptions, self: Transformation$1, fromI: any) => Effect<any, ParseIssue, any>;
-  readonly encode: (toI: any, options: ParseOptions, self: Transformation$1, toA: any) => Effect<any, ParseIssue, any>;
+  readonly decode: (fromA: any, options: ParseOptions, self: Transformation$1, fromI: any) => Effect$1<any, ParseIssue, any>;
+  readonly encode: (toI: any, options: ParseOptions, self: Transformation$1, toA: any) => Effect$1<any, ParseIssue, any>;
   /**
    * @since 3.10.0
    */
   readonly _tag = "FinalTransformation";
-  constructor(decode: (fromA: any, options: ParseOptions, self: Transformation$1, fromI: any) => Effect<any, ParseIssue, any>, encode: (toI: any, options: ParseOptions, self: Transformation$1, toA: any) => Effect<any, ParseIssue, any>);
+  constructor(decode: (fromA: any, options: ParseOptions, self: Transformation$1, fromI: any) => Effect$1<any, ParseIssue, any>, encode: (toI: any, options: ParseOptions, self: Transformation$1, toA: any) => Effect$1<any, ParseIssue, any>);
 }
 /**
  * @category model
@@ -6845,14 +6840,14 @@ declare class TypeLiteralTransformation {
   constructor(propertySignatureTransformations: ReadonlyArray<PropertySignatureTransformation$1>);
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/ParseResult.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/ParseResult.d.ts
 /**
  * `ParseIssue` is a type that represents the different types of errors that can occur when decoding/encoding a value.
  *
  * @category model
  * @since 3.10.0
  */
-type ParseIssue = Type$3 | Missing | Unexpected | Forbidden | Pointer | Refinement | Transformation | Composite;
+type ParseIssue = Type$4 | Missing | Unexpected | Forbidden | Pointer | Refinement | Transformation | Composite;
 /**
  * @category model
  * @since 3.10.0
@@ -6909,7 +6904,7 @@ declare class Missing {
   /**
    * @since 3.10.0
    */
-  readonly ast: Type$4;
+  readonly ast: Type$5;
   /**
    * @since 3.10.0
    */
@@ -6926,7 +6921,7 @@ declare class Missing {
   /**
    * @since 3.10.0
    */
-  ast: Type$4,
+  ast: Type$5,
   /**
    * @since 3.10.0
    */
@@ -6990,7 +6985,7 @@ declare class Transformation {
  * @category model
  * @since 3.10.0
  */
-declare class Type$3 {
+declare class Type$4 {
   readonly ast: AST;
   readonly actual: unknown;
   readonly message?: string | undefined;
@@ -7017,7 +7012,7 @@ declare class Forbidden {
   constructor(ast: AST, actual: unknown, message?: string | undefined);
 }
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Pretty.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Pretty.d.ts
 /**
  * @category model
  * @since 3.10.0
@@ -7031,7 +7026,7 @@ interface Pretty<To> {
  */
 type PrettyAnnotation<A$1, TypeParameters extends ReadonlyArray<any> = readonly []> = (...pretties: { readonly [K in keyof TypeParameters]: Pretty<TypeParameters[K]> }) => Pretty<A$1>;
 //#endregion
-//#region ../../../../node_modules/.pnpm/effect@3.20.0/node_modules/effect/dist/dts/Schema.d.ts
+//#region ../../../../node_modules/.pnpm/effect@3.21.2/node_modules/effect/dist/dts/Schema.d.ts
 /**
  * @since 3.10.0
  */
@@ -7040,12 +7035,12 @@ type Simplify<A$1> = { [K in keyof A$1]: A$1[K] } & {};
  * @since 3.10.0
  * @category symbol
  */
-declare const TypeId$1: unique symbol;
+declare const TypeId$2: unique symbol;
 /**
  * @since 3.10.0
  * @category symbol
  */
-type TypeId$1 = typeof TypeId$1;
+type TypeId$2 = typeof TypeId$2;
 /**
  * @category model
  * @since 3.10.0
@@ -7106,7 +7101,7 @@ declare namespace Schema {
    * @since 3.10.0
    */
   interface Variance<A$1, I$1, R$1> {
-    readonly [TypeId$1]: {
+    readonly [TypeId$2]: {
       readonly _A: Invariant<A$1>;
       readonly _I: Invariant<I$1>;
       readonly _R: Covariant<R$1>;
@@ -7413,14 +7408,14 @@ type PropertySignatureTypeId = typeof PropertySignatureTypeId;
  * @category PropertySignature
  * @since 3.10.0
  */
-interface PropertySignature<TypeToken extends PropertySignature.Token, Type$5, Key$1 extends PropertyKey, EncodedToken extends PropertySignature.Token, Encoded$1, HasDefault extends boolean = false, R$1 = never> extends Schema.Variance<Type$5, Encoded$1, R$1>, Pipeable {
+interface PropertySignature<TypeToken extends PropertySignature.Token, Type$6, Key$1 extends PropertyKey, EncodedToken extends PropertySignature.Token, Encoded$1, HasDefault extends boolean = false, R$1 = never> extends Schema.Variance<Type$6, Encoded$1, R$1>, Pipeable {
   readonly [PropertySignatureTypeId]: null;
   readonly _TypeToken: TypeToken;
   readonly _EncodedToken: EncodedToken;
   readonly _HasDefault: HasDefault;
   readonly _Key: Key$1;
   readonly ast: PropertySignature.AST;
-  annotations(annotations: PropertySignature.Annotations<Type$5>): PropertySignature<TypeToken, Type$5, Key$1, EncodedToken, Encoded$1, HasDefault, R$1>;
+  annotations(annotations: PropertySignature.Annotations<Type$6>): PropertySignature<TypeToken, Type$6, Key$1, EncodedToken, Encoded$1, HasDefault, R$1>;
 }
 /**
  * @category api interface
@@ -7749,12 +7744,6 @@ declare namespace Annotations {
    */
   interface Filter<A$1, P$1 = A$1> extends Schema<A$1, readonly [P$1]> {}
 }
-declare const NonEmptyString_base: filter<typeof String$>;
-/**
- * @category string constructors
- * @since 3.10.0
- */
-declare class NonEmptyString extends NonEmptyString_base {}
 type RequiredKeys<T$1> = { [K in keyof T$1]-?: {} extends Pick<T$1, K> ? never : K }[keyof T$1];
 /**
  * @category Constructor utils
@@ -7764,76 +7753,92 @@ type MakeOptions = boolean | {
   readonly disableValidation?: boolean | undefined;
 };
 //#endregion
-//#region ../../../common/debug/dist/types/src/devtools-formatter.d.ts
+//#region ../../../common/keys/dist/types/src/URI.d.ts
+/**
+ * Branded string type for any URI.
+ * Base type for more specific URI schemes like DXN and EID.
+ */
+type URI = string & {
+  readonly __URI: unique symbol;
+};
+//#endregion
+//#region ../../../common/keys/dist/types/src/DXN.d.ts
 /**
- * Lets types provide custom formatters for the Chrome Devtools.
+ * DXN names a resource (type, plugin, capability, etc.).
  *
- * https://www.mattzeunert.com/2016/02/19/custom-chrome-devtools-object-formatters.html
- * NOTE: Must be enabled in chrome devtools preferences.
+ * Format: `dxn:<nsid>[:<version>]` where NSID is an atproto-style dotted name.
  *
  * @example
- * ```typescript
- * class MyType {
- *  get [devtoolsFormatter] (): DevtoolsFormatter {
- *    ...
- *  }
+ * ```
+ * dxn:org.dxos.type.calendar
+ * dxn:org.dxos.type.calendar:1.0.0
+ * dxn:org.dxos.plugin.markdown
  * ```
  */
-declare const devtoolsFormatter: unique symbol;
-type JsonML = [string, Record<string, any>?, ...(JsonML | string)[]];
-interface DevtoolsFormatter {
+type DXN = URI & {
+  readonly __DXN: unique symbol;
+};
+//#endregion
+//#region ../../../common/keys/dist/types/src/entity-id.d.ts
+declare const EntityIdSchema: refine<string, typeof String$>;
+type EntityId = typeof EntityIdSchema.Type;
+interface EntityIdClass extends SchemaClass<EntityId, string> {
   /**
-   * NOTE: Make sure to do an instance check and return null if the object is not of the correct type.
+   * @returns true if the string is a valid EntityId.
    */
-  header: (config?: any) => JsonML | null;
-  hasBody?: (config?: any) => boolean;
-  body?: (config?: any) => JsonML | null;
-}
-//#endregion
-//#region ../../../common/debug/dist/types/src/inspect-custom.d.ts
-/**
- * Using this allows code to be written in a portable fashion, so that the custom inspect function is used in an Node.js environment and ignored in the browser.
- */
-declare const inspectCustom: unique symbol;
-//#endregion
-//#region ../../../common/keys/dist/types/src/object-id.d.ts
-declare const ObjectIdSchema: refine<string, typeof String$>;
-type ObjectId = typeof ObjectIdSchema.Type;
-interface ObjectIdClass extends SchemaClass<ObjectId, string> {
+  isValid(id: string): id is EntityId;
   /**
-   * @returns true if the string is a valid ObjectId.
+   * Creates an EntityId from a string validating the format.
    */
-  isValid(id: string): id is ObjectId;
+  make(id: string): EntityId;
   /**
-   * Creates an ObjectId from a string validating the format.
+   * Generates a random EntityId.
    */
-  make(id: string): ObjectId;
+  random(): EntityId;
   /**
-   * Generates a random ObjectId.
+   * Derives a deterministic ULID-format EntityId from arbitrary seed values.
+   *
+   * The same inputs always produce the same id, across processes, isolates, and workers.
+   * Unlike `random()`, this method does not call `crypto.getRandomValues()` and is therefore
+   * safe to call at module top-level — required for Cloudflare workerd, which forbids random
+   * generation in global scope.
+   *
+   * Intended for stable identity of declarative artefacts (e.g. `Type.Type` entities derived
+   * from a `(typename, version)` pair, fixtures, well-known objects). NOT a substitute for
+   * `random()` when global uniqueness is required: callers must guarantee seed uniqueness
+   * themselves; identical seeds yield identical ids and therefore collide.
+   *
+   * The result always passes `EntityId.isValid(...)`.
+   *
+   * @param seed - One or more seed values; coerced to strings and joined.
+   *
+   * ```ts
+   * EntityId.deterministic('org.dxos.type.person', '0.1.0'); // stable across runs
+   * ```
    */
-  random(): ObjectId;
+  deterministic(...seed: (string | number)[]): EntityId;
   /**
    * WARNING: To be used only within tests.
    *
-   * Disables randomness in ObjectId generation, causing the same sequence of IDs to be generated.
+   * Disables randomness in EntityId generation, causing the same sequence of IDs to be generated.
    * Do not use in production code as this will cause data collisions.
    * Place this at the top of the test file to ensure that the same sequence of IDs is generated.
    *
    * ```ts
-   * ObjectId.dangerouslyDisableRandomness();
+   * EntityId.dangerouslyDisableRandomness();
    *
    * describe('suite', () => {
    *   // ...
    * });
    * ```
    *
-   * NOTE: The generated IDs depend on the order of ObjectId.random() calls, which might be affected by test order, scheduling, etc.
+   * NOTE: The generated IDs depend on the order of EntityId.random() calls, which might be affected by test order, scheduling, etc.
    */
   dangerouslyDisableRandomness(): void;
   /**
    * WARNING: To be used only within tests.
    *
-   * Pins the time component of generated ObjectIds and seeds the PRNG used for the random component,
+   * Pins the time component of generated EntityIds and seeds the PRNG used for the random component,
    * causing the same sequence of IDs to be generated across runs.
    * Do not use in production code as this will cause data collisions.
    *
@@ -7841,10 +7846,10 @@ interface ObjectIdClass extends SchemaClass<ObjectId, string> {
    * @param seed - Seed value for the PRNG used for the ULID random component.
    *
    * ```ts
-   * ObjectId.dangerouslySetSeed(new Date('2025-01-01').getTime(), 42);
+   * EntityId.dangerouslySetSeed(new Date('2025-01-01').getTime(), 42);
    * ```
    *
-   * NOTE: The generated IDs depend on the order of ObjectId.random() calls, which might be affected by test order, scheduling, etc.
+   * NOTE: The generated IDs depend on the order of EntityId.random() calls, which might be affected by test order, scheduling, etc.
    */
   dangerouslySetSeed(time: number, seed: number): void;
 }
@@ -7853,7 +7858,7 @@ interface ObjectIdClass extends SchemaClass<ObjectId, string> {
  *
  * Follows ULID spec.
  */
-declare const ObjectId: ObjectIdClass;
+declare const EntityId: EntityIdClass;
 //#endregion
 //#region ../../../common/keys/dist/types/src/space-id.d.ts
 /**
@@ -7873,125 +7878,20 @@ declare const SpaceId: Schema<SpaceId, string> & {
   random: () => SpaceId;
 };
 //#endregion
-//#region ../../../common/keys/dist/types/src/dxn.d.ts
-declare const QueueSubspaceTags: Readonly<{
-  DATA: "data";
-  TRACE: "trace";
-}>;
-type QueueSubspaceTag = (typeof QueueSubspaceTags)[keyof typeof QueueSubspaceTags];
+//#region ../../../common/keys/dist/types/src/EID.d.ts
 /**
- * DXN unambiguously names a resource like an ECHO object, schema definition, plugin, etc.
- * Each DXN starts with a dxn prefix, followed by a resource kind.
- * Colon Symbol : is used a delimiter between parts.
- * DXNs may contain slashes.
- * '@' in the place of the space id is used to denote that the DXN should be resolved in the local space.
+ * Addresses an ECHO object or space. Uses the `echo:` URI scheme.
  *
  * @example
  * ```
- * dxn:echo:<space key>:<echo id>
- * dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
- * dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6
- * dxn:type:org.dxos.type.calendar
- * dxn:plugin:org.dxos.agent.plugin.functions
+ * echo://BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE/01J00J9B45YHYSGZQTQMSKMGJ6
+ * echo:/01J00J9B45YHYSGZQTQMSKMGJ6
+ * echo://BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE
  * ```
  */
-declare class DXN {
-  #private;
-  static Schema: refine<string, typeof NonEmptyString>;
-  static hash(dxn: DXN): string;
-  /**
-   * Kind constants.
-   */
-  static kind: Readonly<{
-    /**
-     * dxn:type:<type_name>[:<version>]
-     */
-    TYPE: "type";
-    /**
-     * dxn:echo:<space_id>:<echo_id>
-     * dxn:echo:@:<echo_id>
-     */
-    ECHO: "echo";
-    /**
-     * The subspace tag enables us to partition queues by usage within the context of a space.
-     * dxn:queue:<subspace_tag>:<space_id>:<queue_id>[:object_id]
-     * dxn:queue:data:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-     * dxn:queue:trace:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
-     */
-    QUEUE: "queue";
-  }>;
-  /**
-   * Exactly equals.
-   */
-  static equals(a: DXN, b: DXN): boolean;
-  static equalsEchoId(a: DXN, b: DXN): boolean;
-  static isDXNString(dxn: string): boolean;
-  static parse(dxn: string): DXN;
-  static tryParse(dxn: string): DXN | undefined;
-  /**
-   * @example `dxn:type:com.example.type.person`
-   */
-  static fromTypename(typename: string): DXN;
-  /**
-   * @example `dxn:type:com.example.type.person:0.1.0`
-   */
-  static fromTypenameAndVersion(typename: string, version: string): DXN;
-  /**
-   * @example `dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6`
-   */
-  static fromSpaceAndObjectId(spaceId: SpaceId, objectId: ObjectId): DXN;
-  /**
-   * @example `dxn:echo:@:01J00J9B45YHYSGZQTQMSKMGJ6`
-   */
-  static fromLocalObjectId(id: string): DXN;
-  static fromQueue(subspaceTag: QueueSubspaceTag, spaceId: SpaceId, queueId: ObjectId, objectId?: ObjectId): DXN;
-  constructor(kind: string, parts: string[]);
-  toString(): DXN.String;
-  toJSON(): string;
-  /**
-   * Used by Node.js to get textual representation of this object when it's printed with a `console.log` statement.
-   */
-  [inspectCustom](depth: number, options: InspectOptionsStylized, inspectFn: typeof inspect): string;
-  get [devtoolsFormatter](): DevtoolsFormatter;
-  get kind(): string;
-  get parts(): string[];
-  get typename(): string;
-  equals(other: DXN): boolean;
-  hasTypenameOf(typename: string): boolean;
-  isLocalObjectId(): boolean;
-  asTypeDXN(): DXN.TypeDXN | undefined;
-  asEchoDXN(): DXN.EchoDXN | undefined;
-  asQueueDXN(): DXN.QueueDXN | undefined;
-  /**
-   * Produces a new DXN with the given parts appended.
-   */
-  extend(parts: string[]): DXN;
-}
-/**
- * API namespace.
- */
-declare namespace DXN {
-  /**
-   * DXN represented as a javascript string.
-   */
-  type String = string & {
-    __DXNString: never;
-  };
-  type TypeDXN = {
-    type: string;
-    version?: string;
-  };
-  type EchoDXN = {
-    spaceId?: SpaceId;
-    echoId: string;
-  };
-  type QueueDXN = {
-    subspaceTag: QueueSubspaceTag;
-    spaceId: SpaceId;
-    queueId: string;
-    objectId?: string;
-  };
-}
+type EID = URI & {
+  readonly __EID: unique symbol;
+};
 //#endregion
 //#region ../echo-protocol/dist/types/src/foreign-key.d.ts
 declare const ForeignKey_: Struct<{
@@ -8011,30 +7911,24 @@ type ForeignKey = Schema.Type<typeof ForeignKey_>;
  */
 declare const ForeignKey: Schema<ForeignKey>;
 //#endregion
-//#region ../../../common/util/dist/types/src/types.d.ts
-/**
- * Removes readonly modifiers from top-level properties of T.
- * Also converts readonly arrays at the top level to mutable arrays.
- * For nested properties, mutability depends on the schema definition.
- */
-type ToMutable<T$1> = T$1 extends object ? { -readonly [K in keyof T$1]: T$1[K] extends readonly (infer U)[] ? U[] : T$1[K] } : T$1;
-//#endregion
-//#region ../../../common/async/dist/types/src/cleanup.d.ts
-type CleanupFn = () => void;
-//#endregion
 //#region ../echo-protocol/dist/types/src/reference.d.ts
 /**
  * Reference as it is stored in Automerge document.
  */
 type EncodedReference = {
-  '/': string;
+  '/': URI;
 };
 declare const EncodedReference: Readonly<{
   isEncodedReference: (value: any) => value is EncodedReference;
-  getReferenceString: (value: EncodedReference) => string;
-  toDXN: (value: EncodedReference) => DXN;
-  fromDXN: (dxn: DXN) => EncodedReference;
-  fromLegacyTypename: (typename: string) => EncodedReference;
+  /**
+   * Returns the opaque URI stored in the encoded reference (any scheme: `echo:` or `dxn:`).
+   * Consumers can narrow with `EID.isEID(uri)` / `DXN.isDXN(uri)`.
+   */
+  toURI: (value: EncodedReference) => URI;
+  /**
+   * Creates an encoded reference from an opaque URI.
+   */
+  fromURI: (uri: URI) => EncodedReference;
 }>;
 //#endregion
 //#region ../echo-protocol/dist/types/src/query/ast.d.ts
@@ -8045,8 +7939,8 @@ declare const EncodedReference: Readonly<{
  */
 declare const FilterObject_: Struct<{
   type: Literal<["object"]>;
-  typename: Union<[refine<string, typeof NonEmptyString>, typeof Null]>;
-  id: optional<Array$<ObjectIdClass>>;
+  typename: Union<[Schema<URI, URI, never>, typeof Null]>;
+  id: optional<Array$<EntityIdClass>>;
   /**
    * Filter by property.
    * Must not include object ID.
@@ -8181,7 +8075,7 @@ declare const FilterOr: Schema<FilterOr>;
 declare const FilterChildOf_: Struct<{
   type: Literal<["child-of"]>;
   /** Parent DXNs to match children of. */
-  parents: Array$<refine<string, typeof NonEmptyString>>;
+  parents: Array$<Schema<EID, EID, never>>;
   /** Whether to match transitively (grandchildren, etc.). Defaults to true. */
   transitive: typeof Boolean$;
 }>;
@@ -8232,7 +8126,7 @@ declare const QueryIncomingReferencesClause_: Struct<{
    * If null, matches references from any property.
    */
   property: NullOr<typeof String$>;
-  typename: Union<[refine<string, typeof NonEmptyString>, typeof Null]>;
+  typename: Union<[Schema<URI, URI, never>, typeof Null]>;
 }>;
 interface QueryIncomingReferencesClause extends Schema.Type<typeof QueryIncomingReferencesClause_> {}
 declare const QueryIncomingReferencesClause: Schema<QueryIncomingReferencesClause>;
@@ -8368,15 +8262,27 @@ declare const QueryFromClause_: Struct<{
   type: Literal<["from"]>;
   query: suspend<QueryFilterClause | QueryFromClause | QueryHierarchyTraversalClause | QueryIncomingReferencesClause | QueryLimitClause | QueryOptionsClause | QueryOrderClause | QueryReferenceTraversalClause | QueryRelationClause | QueryRelationTraversalClause | QuerySelectClause | QuerySetDifferenceClause | QueryUnionClause, QueryFilterClause | QueryFromClause | QueryHierarchyTraversalClause | QueryIncomingReferencesClause | QueryLimitClause | QueryOptionsClause | QueryOrderClause | QueryReferenceTraversalClause | QueryRelationClause | QueryRelationTraversalClause | QuerySelectClause | QuerySetDifferenceClause | QueryUnionClause, never>;
   from: Union<[TaggedStruct<"scope", {
-    scope: suspend<{
-      readonly spaceIds?: readonly string[] | undefined;
-      readonly allFeedsFromSpaces?: boolean | undefined;
-      readonly feeds?: readonly string[] | undefined;
+    scopes: Array$<suspend<{
+      readonly _tag: "space";
+      readonly spaceId?: string | undefined;
+      readonly includeAllFeeds?: boolean | undefined;
+    } | {
+      readonly _tag: "feed";
+      readonly feedUri: string;
+    } | {
+      readonly _tag: "registry";
+      readonly location: "local" | "remote";
     }, {
-      readonly allFeedsFromSpaces?: boolean | undefined;
-      readonly feeds?: readonly string[] | undefined;
-      readonly spaceIds?: readonly string[] | undefined;
-    }, never>;
+      readonly _tag: "space";
+      readonly includeAllFeeds?: boolean | undefined;
+      readonly spaceId?: string | undefined;
+    } | {
+      readonly _tag: "feed";
+      readonly feedUri: string;
+    } | {
+      readonly _tag: "registry";
+      readonly location: "local" | "remote";
+    }, never>>;
   }>, TaggedStruct<"query", {
     query: suspend<QueryFilterClause | QueryFromClause | QueryHierarchyTraversalClause | QueryIncomingReferencesClause | QueryLimitClause | QueryOptionsClause | QueryOrderClause | QueryReferenceTraversalClause | QueryRelationClause | QueryRelationTraversalClause | QuerySelectClause | QuerySetDifferenceClause | QueryUnionClause, QueryFilterClause | QueryFromClause | QueryHierarchyTraversalClause | QueryIncomingReferencesClause | QueryLimitClause | QueryOptionsClause | QueryOrderClause | QueryReferenceTraversalClause | QueryRelationClause | QueryRelationTraversalClause | QuerySelectClause | QuerySetDifferenceClause | QueryUnionClause, never>;
   }>]>;
@@ -8384,8 +8290,8 @@ declare const QueryFromClause_: Struct<{
 interface QueryFromClause extends Schema.Type<typeof QueryFromClause_> {}
 declare const QueryFromClause: Schema<QueryFromClause>;
 declare const Query_: Union<[Schema<QuerySelectClause, QuerySelectClause, never>, Schema<QueryFilterClause, QueryFilterClause, never>, Schema<QueryReferenceTraversalClause, QueryReferenceTraversalClause, never>, Schema<QueryIncomingReferencesClause, QueryIncomingReferencesClause, never>, Schema<QueryRelationClause, QueryRelationClause, never>, Schema<QueryRelationTraversalClause, QueryRelationTraversalClause, never>, Schema<QueryHierarchyTraversalClause, QueryHierarchyTraversalClause, never>, Schema<QueryUnionClause, QueryUnionClause, never>, Schema<QuerySetDifferenceClause, QuerySetDifferenceClause, never>, Schema<QueryOrderClause, QueryOrderClause, never>, Schema<QueryOptionsClause, QueryOptionsClause, never>, Schema<QueryLimitClause, QueryLimitClause, never>, Schema<QueryFromClause, QueryFromClause, never>]>;
-type Query$2 = Schema.Type<typeof Query_>;
-declare const Query$2: Schema<Query$2>;
+type Query$1 = Schema.Type<typeof Query_>;
+declare const Query$1: Schema<Query$1>;
 declare const QueryOptions: Struct<{
   /**
    * Nested select statements will use this option to filter deleted objects.
@@ -8399,26 +8305,86 @@ declare const QueryOptions: Struct<{
 interface QueryOptions extends Schema.Type<typeof QueryOptions> {}
 /**
  * Specifies the scope of the data to query from.
+ * A `from` clause may carry multiple scopes; results are unioned across them.
+ */
+declare const Scope: Union<[TaggedStruct<"space", {
+  spaceId: optional<typeof String$>;
+  includeAllFeeds: optional<typeof Boolean$>;
+}>, TaggedStruct<"feed", {
+  feedUri: typeof String$;
+}>, TaggedStruct<"registry", {
+  location: Literal<["local", "remote"]>;
+}>]>;
+type Scope = Schema.Type<typeof Scope>;
+//#endregion
+//#region ../echo/dist/types/src/internal/common/types/entity.d.ts
+/**
+ * String key used to identify the kind of an entity instance (object or relation).
  */
-declare const Scope: Struct<{
-  /**
-   * The nested select statemets will select from the given spaces.
-   *
-   * NOTE: Spaces and feeds are unioned together if both are specified.
-   */
-  spaceIds: optional<Array$<typeof String$>>;
-  /**
-   * If true, the nested select statements will select from all feeds in the spaces specified by `spaceIds`.
-   */
-  allFeedsFromSpaces: optional<typeof Boolean$>;
-  /**
-   * The nested select statemets will select from the given feeds (by underlying queue DXN).
-   *
-   * NOTE: Spaces and feeds are unioned together if both are specified.
-   */
-  feeds: optional<Array$<refine<string, typeof NonEmptyString>>>;
-}>;
-interface Scope extends Schema.Type<typeof Scope> {}
+declare const KindId$1: '~@dxos/echo/Kind';
+type KindId$1 = typeof KindId$1;
+/**
+ * String key used to identify the kind of a schema (object schema or relation schema).
+ * Parallels KindId which identifies instance kinds.
+ */
+declare const SchemaKindId: '~@dxos/echo/SchemaKind';
+type SchemaKindId = typeof SchemaKindId;
+/**
+ * Hidden slot on a static `Type.Type` entity that holds the source Effect
+ * Schema. `Type.getSchema(...)` reads this for static types; persisted types
+ * rebuild from `jsonSchema` instead. Stored as a string key for declaration
+ * portability (see KindId comment above).
+ */
+declare const StaticTypeSchemaSlot: '~@dxos/echo/Type.StaticSchema';
+type StaticTypeSchemaSlot = typeof StaticTypeSchemaSlot;
+/**
+ * Phantom string key on `Type<A>` entities that carries the instance type `A`.
+ * Lets internal helpers (`makeObject`, `createObject`, etc.) pattern-match the
+ * instance type from an entity input without importing from the top-level
+ * `Type` module. Mirrors `Type.InstancePhantomId` (declared in `Type.ts`).
+ *
+ * Stored as a string key so declarations remain portable across packages
+ * (see KindId comment above).
+ */
+declare const InstancePhantomId$1: '~@dxos/echo/Type.Instance';
+type InstancePhantomId$1 = typeof InstancePhantomId$1;
+/**
+ * Nominal brand carried by the well-known "any object" / "any relation"
+ * schemas (`Obj.Unknown`, `Relation.Unknown`). The brand lets `Ref.Ref`,
+ * `Filter.type`, and `Query.type` accept these schemas in addition to
+ * `Type.Type` entities, without opening the door to arbitrary raw schemas.
+ *
+ * Stored as a string key so declarations remain portable across packages
+ * (see KindId comment above).
+ */
+declare const UnknownTypeSchemaBrandId: '~@dxos/echo/UnknownTypeSchemaBrand';
+type UnknownTypeSchemaBrandId = typeof UnknownTypeSchemaBrandId;
+/**
+ * Schema-side companion to `Type.Type` entities for the "any object" /
+ * "any relation" cases. Branded so `Ref.Ref` / `Filter.type` / `Query.type`
+ * can pattern-match on it; arbitrary `Schema.Schema` values do not satisfy
+ * this shape.
+ */
+interface UnknownTypeSchema<A$1, K$1 extends EntityKind> extends Schema<A$1, any, never> {
+  readonly [UnknownTypeSchemaBrandId]: K$1;
+}
+/**
+ * Kinds of entities stored in ECHO: objects, relations, and types.
+ */
+declare enum EntityKind {
+  Object = "object",
+  Relation = "relation",
+  Type = "type",
+}
+//#endregion
+//#region ../../../common/util/dist/types/src/types.d.ts
+type MaybePromise<T$1> = T$1 | Promise<T$1>;
+/**
+ * Removes readonly modifiers from top-level properties of T.
+ * Also converts readonly arrays at the top level to mutable arrays.
+ * For nested properties, mutability depends on the schema definition.
+ */
+type ToMutable<T$1> = T$1 extends object ? { -readonly [K in keyof T$1]: T$1[K] extends readonly (infer U)[] ? U[] : T$1[K] } : T$1;
 //#endregion
 //#region ../../../common/effect/dist/types/src/json-path.d.ts
 type JsonPath = string & {
@@ -8429,7 +8395,7 @@ type JsonPath = string & {
  */
 declare const JsonPath: Schema<JsonPath>;
 //#endregion
-//#region ../../../../node_modules/.pnpm/@effect-atom+atom@0.5.1_@effect+experimental@0.58.0_@effect+platform@0.94.4_effect@3.20_0d92fe5e7b61f71046b89ef5357c0767/node_modules/@effect-atom/atom/dist/dts/AtomHttpApi.d.ts
+//#region ../../../../node_modules/.pnpm/@effect-atom+atom@0.5.3_patch_hash=90a97dcb5aa93197ad34b41c932b405a7ba98679af6885de637f_0b7fb499561b7d4cf5206aa61a152dc5/node_modules/@effect-atom/atom/dist/dts/AtomHttpApi.d.ts
 declare global {
   interface ErrorConstructor {
     stackTraceLimit: number;
@@ -8440,7 +8406,7 @@ declare global {
  * @category Constructors
  */
 //#endregion
-//#region ../../../../node_modules/.pnpm/@effect-atom+atom@0.5.1_@effect+experimental@0.58.0_@effect+platform@0.94.4_effect@3.20_0d92fe5e7b61f71046b89ef5357c0767/node_modules/@effect-atom/atom/dist/dts/AtomRpc.d.ts
+//#region ../../../../node_modules/.pnpm/@effect-atom+atom@0.5.3_patch_hash=90a97dcb5aa93197ad34b41c932b405a7ba98679af6885de637f_0b7fb499561b7d4cf5206aa61a152dc5/node_modules/@effect-atom/atom/dist/dts/AtomRpc.d.ts
 declare global {
   interface ErrorConstructor {
     stackTraceLimit: number;
@@ -8451,20 +8417,284 @@ declare global {
  * @category Constructors
  */
 //#endregion
-//#region ../echo/dist/types/src/internal/Entity/entity.d.ts
-type EchoTypeSchemaProps<T$1, ExtraFields = {}> = Simplify$1<AnyEntity & ToMutable<T$1> & ExtraFields>;
-interface EchoTypeSchema<Self extends Schema.Any, ExtraFields = {}, K$1 extends EntityKind = EntityKind, Fields extends Struct.Fields = Struct.Fields> extends TypeMeta, AnnotableClass<EchoTypeSchema<Self, ExtraFields, K$1, Fields>, EchoTypeSchemaProps<Schema.Type<Self>, ExtraFields>, EchoTypeSchemaProps<Schema.Encoded<Self>, ExtraFields>, Schema.Context<Self>> {
+//#region ../../../common/context/dist/types/src/context.d.ts
+type ContextErrorHandler = (error: Error, ctx: Context$1) => void;
+type DisposeCallback = () => any | Promise<any>;
+type CreateContextProps = {
+  name?: string;
+  parent?: Context$1;
+  attributes?: Record<string, any>;
+  onError?: ContextErrorHandler;
+};
+/**
+ * NOTE: Context is not reusable after it is disposed.
+ */
+declare class Context$1 {
+  #private;
+  static default(): Context$1;
+  maxSafeDisposeCallbacks: number;
+  constructor(params?: CreateContextProps, callMeta?: Partial<CallMetadata>);
+  get disposed(): boolean;
+  get disposeCallbacksLength(): number;
+  get signal(): AbortSignal;
+  /**
+   * Schedules a callback to run when the context is disposed.
+   * May be async, in this case the disposer might choose to wait for all resource to released.
+   * Throwing an error inside the callback will result in the error being logged, but not re-thrown.
+   *
+   * NOTE: Will call the callback immediately if the context is already disposed.
+   *
+   * @returns A function that can be used to remove the callback from the dispose list.
+   */
+  onDispose(callback: DisposeCallback): () => void;
+  /**
+   * Runs all dispose callbacks.
+   * Callbacks are run in the reverse order they were added.
+   * This function never throws.
+   * It is safe to ignore the returned promise if the caller does not wish to wait for callbacks to complete.
+   * Disposing context means that onDispose will throw an error and any errors raised will be logged and not propagated.
+   * @returns true if there were no errors during the dispose process.
+   */
+  dispose(throwOnError?: boolean): Promise<boolean>;
+  /**
+   * Raise the error inside the context.
+   * The error will be propagated to the error handler.
+   * IF the error handler is not set, the error will dispose the context and cause an unhandled rejection.
+   */
+  raise(error: Error): void;
+  derive({
+    onError,
+    attributes
+  }?: CreateContextProps): Context$1;
+  getAttribute(key: string): any;
+  [Symbol.toStringTag]: string;
+  [inspect.custom]: () => string;
+  toString(): string;
+  [Symbol.asyncDispose](): Promise<void>;
+}
+//#endregion
+//#region ../../../common/async/dist/types/src/cleanup.d.ts
+type CleanupFn = () => void;
+//#endregion
+//#region ../../../common/async/dist/types/src/events.d.ts
+type Effect = () => CleanupFn | undefined;
+interface EventEmitterLike {
+  on(event: string, cb: (data?: any) => void): void;
+  off(event: string, cb: (data?: any) => void): void;
+}
+type ListenerOptions = {
+  weak?: boolean;
+  once?: boolean;
+};
+type EventCallback<T$1> = (data: T$1) => MaybePromise<void>;
+/**
+ * An EventEmitter variant that does not do event multiplexing and represents a single event.
+ *
+ * ## Typical usage:
+ * ```javascript
+ * class Model {
+ *   public readonly update = new Event<UpdateData>();
+ *   private readonly privateEvent = new Event<void>();
+ *
+ *   onUpdate(data: UpdateData) {
+ *     ...
+ *     this.update.emit(data);
+ *   }
+ * }
+ *
+ * model.update.on(data => {
+ *   ...
+ * });
+ * ```
+ *
+ * ## Advantages over traditional EventEmitter:
+ * 1. User describes explicitly what events a class has as they are defined as class fields.
+ * 2. User can explicitly define event visibility (public, protected, private).
+ * 3. Having events as class fields allows the compiler to check for correct event usage.
+ * 4. User can type the data that event will be emitting.
+ * 5. Uses composition instead of inheritance.
+ * 6. Removes the cases where event names intersect when used in cases with inheritance.
+ * 7. Remove the need to namespace events when developing a class with events that will be used as a base-class.
+ */
+declare class Event$1<T$1 = void> implements ReadOnlyEvent<T$1> {
   /**
-   * Schema kind key that marks this as an ECHO schema and indicates its kind.
-   * Makes EchoTypeSchema satisfy the Type.AnyObj or Type.Relation.Any type.
+   * Wrap objects that have on/off style event emitters.
    */
-  readonly [SchemaKindId]: K$1;
+  static wrap<T$1>(emitter: EventEmitterLike, eventName: string): Event$1<T$1>;
+  private readonly _listeners;
+  private readonly _effects;
   /**
-   * The fields defined in the original struct schema.
-   * Allows accessing field definitions for introspection.
+   * Emit an event.
+   * In most cases should only be called by the class or entity containing the event.
+   * All listeners are called in order of subscription with persistent ones first.
+   * Listeners are called synchronously in the same stack.
+   * A thrown exception in the listener will stop the event from being emitted to the rest of the listeners.
+   *
+   * @param data param that will be passed to all listeners.
    */
-  readonly fields: Fields;
-  instanceOf(value: unknown): boolean;
+  emit(data: T$1): void;
+  /**
+   * Emit an event and wait for async listeners to complete.
+   * In most cases should only be called by the class or entity containing the event.
+   * All listeners are called in order of subscription with persistent ones first.
+   * Listeners are called sequentially.
+   *
+   * @param data param that will be passed to all listeners.
+   */
+  emitAsync(data: T$1): Promise<void>;
+  /**
+   * Register an event listener.
+   * If provided callback was already registered as once-listener, it is made permanent.
+   *
+   * @param callback
+   * @param options.weak If true, the callback will be weakly referenced and will be garbage collected if no other references to it exist.
+   * @returns function that unsubscribes this event listener
+   */
+  on(callback: EventCallback<T$1>): CleanupFn;
+  on(ctx: Context$1, callback: EventCallback<T$1>, options?: ListenerOptions): CleanupFn;
+  /**
+   * Unsubscribe this callback from new events. Includes persistent and once-listeners.
+   * NOTE: It is recommended to use `Event.on`'s return value instead.
+   * If the callback is not subscribed this is no-op.
+   *
+   * @param callback
+   */
+  off(callback: (data: T$1) => void): void;
+  /**
+   * Register a callback to be called only once when the next event is emitted.
+   * If this callback is already registered as permanent listener, this is no-op.
+   *
+   * @param callback
+   */
+  once(callback: (data: T$1) => void): CleanupFn;
+  once(ctx: Context$1, callback: (data: T$1) => void): CleanupFn;
+  /**
+   * An async iterator that iterates over events.
+   * This iterator runs indefinitely.
+   */
+  [Symbol.asyncIterator](): AsyncIterator<T$1>;
+  /**
+   * Returns a promise that resolves with the first event emitted that matches the provided predicate.
+   *
+   * @param predicate
+   */
+  waitFor(predicate: (data: T$1) => boolean): Promise<T$1>;
+  /**
+   * Returns a promise that resolves once a specific number of events was emitted since this method was called.
+   *
+   * @param expectedCount
+   */
+  waitForCount(expectedCount: number): Promise<T$1>;
+  /**
+   * Similar to waitFor, but the promise resolves immediately if the condition is already true.
+   */
+  waitForCondition(predicate: () => boolean): Promise<void>;
+  /**
+   * Returns the number of persistent listeners.
+   */
+  listenerCount(): number;
+  /**
+   * Add a side effect that will be activated once the event has at least one subscriber.
+   * The provided callback can return a function that will be used to clean up after the last subscriber unsubscribes from the event.
+   * The API is similar to `useEffect` from React.
+   *
+   * ## Example:
+   * ```typescript
+   * event.addEffect(() => {
+   *   // do stuff
+   *   return () => {
+   *     // clean-up
+   *   };
+   * });
+   * ```
+   *
+   * @returns Callback that will remove this effect once called.
+   */
+  addEffect(effect: Effect): CleanupFn;
+  /**
+   * Triggers an event with at least `timeout` milliseconds between each event.
+   * If the event is triggered more often, the event is delayed until the timeout is reached.
+   * If event is emitted for the first time or event wasn't fired for `timeout` milliseconds,
+   * the event is emitted after `timeout / 8` ms.
+   */
+  debounce(timeout?: number): Event$1<void>;
+  /**
+   * Turn any variant of `Event<T>` into an `Event<void>` discarding the callback parameter.
+   */
+  discardParameter(): Event$1<void>;
+  /**
+   * Pipe the events into another event.
+   * @param event
+   */
+  pipeInto(event: Event$1<T$1>): CleanupFn;
+  /**
+   * Overridden to not return implementation details.
+   */
+  toJSON(): {
+    listenerCount: number;
+  };
+  private _addListener;
+  private _runEffects;
+  private _cleanupEffects;
+}
+/**
+ * A version of Event class which only has subscribe methods.
+ * Useful in cases where you want to explicitly prohibit calling `emit` method.
+ */
+interface ReadOnlyEvent<T$1 = void> {
+  /**
+   * Register an event listener.
+   * If provided callback was already registered as once-listener, it is made permanent.
+   *
+   * @param callback
+   * @param options.weak If true, the callback will be weakly referenced and will be garbage collected if no other references to it exist.
+   * @returns function that unsubscribes this event listener
+   */
+  on(callback: (data: T$1) => void): CleanupFn;
+  on(ctx: Context$1, callback: (data: T$1) => void, options?: ListenerOptions): CleanupFn;
+  /**
+   * Unsubscribes this callback from new events. Includes persistent and once-listeners.
+   * NOTE: It is recommended to us `Event.on`'s return value.
+   * If the callback is not subscribed this is no-op.
+   *
+   * @param callback
+   */
+  off(callback: (data: T$1) => void): void;
+  /**
+   * Register a callback to be called only once when the next event is emitted.
+   * If this callback is already registered as permanent listener, this is no-op.
+   *
+   * @param callback
+   */
+  once(callback: (data: T$1) => void): CleanupFn;
+  /**
+   * An async iterator that iterates over events.
+   * This iterator runs indefinitely.
+   */
+  [Symbol.asyncIterator](): AsyncIterator<T$1>;
+  /**
+   * Returns a promise that resolves with the first event emitted that matches the provided predicate.
+   *
+   * @param predicate
+   */
+  waitFor(predicate: (data: T$1) => boolean): Promise<T$1>;
+  /**
+   * Returns a promise that resolves once a specific number of events was emitted since this method was called.
+   *
+   * @param expectedCount
+   */
+  waitForCount(expectedCount: number): Promise<T$1>;
+  /**
+   * Turn any variant of `Event<T>` into an `Event<void>` discarding the callback parameter.
+   */
+  discardParameter(): Event$1<void>;
+  /**
+   * Triggers an event with at least `timeout` milliseconds between each event.
+   * If the event is triggered more often, the event is delayed until the timeout is reached.
+   * If event is emitted for the first time or event wasn't fired for `timeout` milliseconds,
+   * the event is emitted after `timeout / 8` ms.
+   */
+  debounce(timeout?: number): Event$1<void>;
 }
 //#endregion
 //#region ../echo/dist/types/src/internal/JsonSchema/json-schema-type.d.ts
@@ -8679,30 +8909,333 @@ declare const _JsonSchemaType: Struct<{
 interface JsonSchemaType extends Schema.Type<typeof _JsonSchemaType> {}
 declare const JsonSchemaType: Schema<JsonSchemaType>;
 //#endregion
-//#region ../echo/dist/types/src/internal/Ref/ref.d.ts
-declare const RefTypeId: unique symbol;
+//#region ../echo/dist/types/src/internal/Entity/entity.d.ts
+type EchoTypeSchemaProps<T$1, ExtraFields = {}> = Simplify$1<AnyEntity & ToMutable<T$1> & ExtraFields>;
 /**
- * Reference Schema.
+ * Options accepted by every `Type.makeObject` / `Type.makeRelation` / type-kind
+ * factory. Defaults are derived from `(typename, version)` so callers normally
+ * pass nothing.
  */
-interface RefSchema$1<T$1 extends AnyEntity> extends SchemaClass<Ref<T$1>, EncodedReference> {}
+type EchoTypeOptions = {
+  /**
+   * Override the entity id stamped on the in-memory `Type.Type` value.
+   *
+   * Defaults to `EntityId.deterministic(typename, version)` — stable across processes
+   * and workerd-safe (no `crypto.getRandomValues()` at module-evaluation time).
+   * Pass an explicit id (typically `EntityId.random()`) to opt out of the
+   * deterministic default.
+   */
+  id?: EntityId;
+};
 /**
- * Type of the `Ref` function and extra methods attached to it.
+ * In-memory `Type.Type` entity shape produced by `Type.makeObject(dxn)` /
+ * `Type.makeRelation({...})`. A live reactive `TypeSchema` instance —
+ * identical to a persisted `Type.Type` except for database attachment.
+ *
+ * NOT a `Schema.Schema`. The underlying Effect Schema is cached on the hidden
+ * `StaticTypeSchemaSlot` slot — retrieve it via `Type.getSchema(...)`.
  */
-interface RefFn {
-  <S$1 extends Schema.Any>(schema: S$1): RefSchema$1<Schema.Type<S$1>>;
+interface EchoTypeSchema<Self extends Schema.Any, ExtraFields = {}, K$1 extends EntityKind = EntityKind, Fields extends Struct.Fields = Struct.Fields> {
   /**
-   * @returns True if the object is a reference.
+   * Entity-kind brand. Type entities are their own kind (`Type`) regardless of
+   * the kind of instance they describe — `[SchemaKindId]` carries the latter.
+   * This lets predicates like `Obj.isObject` / `Relation.isRelation` cleanly
+   * reject type entities without also having to inspect `[SchemaKindId]`.
    */
-  isRef: (obj: unknown) => obj is Ref<any>;
+  readonly [KindId$1]: EntityKind.Type;
+  /** Schema-kind brand indicating what kind of instance this type describes. */
+  readonly [SchemaKindId]: K$1;
   /**
-   * @returns True if the reference points to the given object id.
+   * Entity id. Always present — stamped at construction — but NOT the type's
+   * identity while in-memory: an unattached type resolves its URI to the typename
+   * DXN, switching to `echo:/<id>` only once attached to a database (see
+   * `getTypeURIFromSpecifier`, which discriminates by database attachment).
    */
-  hasObjectId: (id: ObjectId) => (ref: Ref<any>) => boolean;
+  readonly id: EntityId;
+  /** Source Effect Schema (kept on a hidden slot for `Type.getSchema`). */
+  readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+  readonly jsonSchema: JsonSchemaType;
+  /** Struct fields for introspection. */
+  readonly fields: Fields;
+  /** Phantom — instance type produced by `Obj.make(self, ...)`. */
+  readonly _instance?: EchoTypeSchemaProps<Schema.Type<Self>, ExtraFields>;
   /**
-   * @returns True if the schema is a reference schema.
+   * Phantom slot mirroring `Type<A>` so internal helpers (`makeObject`,
+   * `createObject`, `Ref.make`) infer the instance type uniformly whether
+   * the caller passes an `EchoTypeSchema` or a top-level `Type.Type` entity.
+   *
+   * Includes the instance-kind brand (`[KindId]`) so the phantom is assignable
+   * to the matching public-side interface in `Type.ts` (`Type.Obj` /
+   * `Type.Relation` / `Type.Type`). Each kind projects identity: instances of
+   * an object-kind schema are object-kind entities, type-kind schemas produce
+   * type-kind (persisted Type.Type) entities — the latter additionally carry
+   * the `[SchemaKindId]` / `[StaticTypeSchemaSlot]` brands the echo-handler
+   * proxy exposes on persisted Type entities.
    */
-  isRefSchema: (schema: Schema<any, any>) => schema is RefSchema$1<any>;
-  /**
+  readonly [InstancePhantomId$1]?: EchoTypeSchemaProps<Schema.Type<Self>, ExtraFields> & {
+    readonly [KindId$1]: K$1;
+  } & (K$1 extends EntityKind.Type ? {
+    readonly [SchemaKindId]: EntityKind.Type;
+    readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+  } : {});
+}
+//#endregion
+//#region ../echo/dist/types/src/internal/Entity/type-kind.d.ts
+/**
+ * Type-kind schema marker — produced by {@link EchoTypeKindSchema}.
+ *
+ * Distinguishes meta-schemas (entities of `EntityKind.Type`, such as the
+ * built-in `Type.Type` TypeSchema) from object and relation types.
+ */
+type EchoTypeKindSchema<Self extends Schema.Any, Fields extends Struct.Fields = Struct.Fields> = EchoTypeSchema<Self, {}, EntityKind.Type, Fields>;
+/**
+ * Pipeable that brands a schema as a type-kind ECHO entity. Mirrors
+ * {@link EchoObjectSchema} / {@link EchoRelationSchema}, but stamps the
+ * resulting entity with `[SchemaKindId]: EntityKind.Type` and a matching
+ * `TypeAnnotation.kind = 'type'` so meta-schemas surface uniformly through
+ * `Type.isTypeKind`, `Filter.type`, etc.
+ */
+declare const EchoTypeKindSchema: {
+  (dxn: DXN, options?: EchoTypeOptions): <Self extends Schema.Any, Fields extends Struct.Fields = Struct.Fields>(self: Self & {
+    fields?: Fields;
+  }) => EchoTypeKindSchema<Self, Fields>;
+};
+//#endregion
+//#region ../echo/dist/types/src/internal/Type/type-schema.d.ts
+/**
+ * Raw struct backing {@link TypeSchema}. Exposed only so `TypeSchema`
+ * (the TS type) can derive its data fields via `Schema.Schema.Type<typeof ...>`;
+ * runtime callers should use {@link TypeSchema} (the piped, branded entity).
+ *
+ * `typename` and `version` are NOT data fields — they live in `EntityMeta.key` /
+ * `EntityMeta.version` (the canonical registry-provenance pair, queryable via
+ * `Filter.key(...)`). The same `jsonSchema` payload also embeds them so a
+ * standalone JSON-Schema export remains self-describing, but the schema-registry
+ * reads/writes them through meta.
+ */
+declare const TypeSchemaStruct: Struct<{
+  name: optional<typeof String$>;
+  jsonSchema: Schema<JsonSchemaType, JsonSchemaType, never>;
+}>;
+/**
+ * Persistent representation of a schema.
+ */
+declare const TypeSchema: EchoTypeKindSchema<Struct<{
+  name: optional<typeof String$>;
+  jsonSchema: Schema<JsonSchemaType, JsonSchemaType, never>;
+}>, Readonly<{
+  name: optional<typeof String$>;
+  jsonSchema: Schema<JsonSchemaType, JsonSchemaType, never>;
+}>>;
+/**
+ * Persistent representation of a schema — the runtime shape that
+ * `db.addType(Type.makeObjectFromJsonSchema(...))` produces
+ * and `Filter.type(Type.Type).run()` returns.
+ *
+ * Structurally identical to a static `Type.Type` entity: the entity-handler's
+ * `get` trap exposes `[SchemaKindId]` (derived from `system.kind` and
+ * `data.jsonSchema.entityKind`) and rebuilds `[StaticTypeSchemaSlot]` lazily
+ * from `jsonSchema`, so a persisted instance satisfies the public `Type<A>`
+ * interface without casting.
+ */
+type TypeSchema = Schema.Type<typeof TypeSchemaStruct> & {
+  /** Object identifier — injected by `EchoTypeKindSchema` and stamped at construction. */
+  readonly id: string;
+  /** Entity-kind discriminator (object/relation/type) carried on every entity instance. */
+  readonly [KindId$1]: EntityKind.Type;
+  /** Kind of schema described by this meta-instance — always `EntityKind.Type` for `Type.Type` itself. */
+  readonly [SchemaKindId]: EntityKind.Type;
+  /** Effect Schema rebuilt lazily from `jsonSchema`; satisfies `Type.getSchema(...)` without an extra cast. */
+  readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+};
+//#endregion
+//#region ../echo/dist/types/src/Relation.d.ts
+type Endpoints$1<Source$1, Target$2> = {
+  [Source$1]: Source$1;
+  [Target$2]: Target$2;
+};
+/**
+ * Get relation source type.
+ */
+type SourceOf<A$1> = A$1 extends Endpoints$1<infer S, infer _T> ? S : never;
+/**
+ * Get relation target type.
+ */
+type TargetOf<A$1> = A$1 extends Endpoints$1<infer _S, infer T> ? T : never;
+//#endregion
+//#region ../echo/dist/types/src/Type.d.ts
+/**
+ * Structural base shared by the three sibling type-entity interfaces
+ * ({@link Obj}, {@link Relation}, {@link Type}). NOT exported — callers
+ * should constrain on {@link AnyEntity} when they want "any of the three"
+ * and on the specific kind interface otherwise.
+ */
+interface BaseTypeEntity<A$1> {
+  /**
+   * Entity-kind brand of the type-entity value itself — always `EntityKind.Type`.
+   * The kind of instance the type *describes* lives on `[SchemaKindId]`
+   * (Object / Relation / Type). Lets `Obj.isObject` / `Relation.isRelation`
+   * reject type entities by a single `[KindId]` check.
+   */
+  readonly [KindId$1]: EntityKind.Type;
+  /**
+   * Object id. Like all ECHO entities, type entities always carry an id —
+   * stamped at construction for in-memory (static) declarations and assigned by
+   * the database once persisted. The id does NOT determine the entity's URI:
+   * static types resolve to their typename DXN, persisted types to `echo:/<id>`
+   * (see `getTypeURIFromSpecifier`).
+   */
+  readonly id: EntityId;
+  readonly name?: string;
+  readonly jsonSchema: JsonSchemaType;
+  readonly [InstancePhantomId]?: A$1;
+}
+/**
+ * TypeScript type for an ECHO object type — a `Type.Type<A>` entity.
+ *
+ * `T` is the instance type produced by `Obj.make(Foo, props)`. `Fields` is
+ * retained as a structural hint (the runtime value still carries `.fields`),
+ * but consumers should derive instance/encoded types via `Type.InstanceType`.
+ *
+ * **Not a `Schema.Schema`.** `Foo.ast` / `Schema.Schema.Type<typeof Foo>` /
+ * `Schema.extend(Foo)` no longer typecheck — extract the Effect Schema via
+ * `Type.getSchema(Foo)` first, or derive instance types via
+ * `Type.InstanceType<typeof Foo>`.
+ *
+ * @example
+ * ```ts
+ * const Person = Schema.Struct({
+ *   name: Schema.String,
+ * }).pipe(Type.makeObject(DXN.make('com.example.type.person', '0.1.0')));
+ *
+ * type Person = Type.InstanceType<typeof Person>;
+ * ```
+ */
+interface Obj$1<T$1, Fields extends Struct.Fields = Struct.Fields> extends BaseTypeEntity<T$1 & OfKind<typeof Kind.Object>> {
+  /** Schema-kind brand (object). */
+  readonly [SchemaKindId]: EntityKind.Object;
+  /** Source Effect Schema — used internally by `Type.getSchema(self)`. */
+  readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+  /**
+   * The fields defined in the original struct schema.
+   * Allows accessing field definitions for introspection.
+   */
+  readonly fields: Fields;
+}
+/**
+ * Type that represents any ECHO object type — a `Type.Type` entity branded
+ * with the object entity kind, i.e. what `Type.makeObject(dxn)` produces.
+ */
+type AnyObj = Obj$1<unknown>;
+/**
+ * ECHO meta-schema entity — stores `{ name?, typename, version, jsonSchema }`.
+ * Type-kind sibling of `Type.makeObject(...)` / `Type.makeRelation(...)` outputs.
+ * Stored types live under this entity; filter via `Filter.type(Type.Type)`.
+ */
+declare const Type$3: Type$3<TypeSchema>;
+/**
+ * TypeScript type for an ECHO relation type — a `Type.Type<A>` entity.
+ *
+ * `T` is the instance-property type produced by `Relation.make(...)` (excluding
+ * source/target endpoints). `Source` and `Target` are the endpoint types.
+ *
+ * **Not a `Schema.Schema`.** See {@link Obj}'s note.
+ */
+interface Relation<T$1, Source$1, Target$2, Fields extends Struct.Fields = Struct.Fields> extends BaseTypeEntity<Endpoints$1<Source$1, Target$2> & T$1 & OfKind<typeof Kind.Relation>> {
+  /** Schema-kind brand (relation). */
+  readonly [SchemaKindId]: EntityKind.Relation;
+  /** Source Effect Schema — used internally by `Type.getSchema(self)`. */
+  readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+  /**
+   * The fields defined in the original struct schema.
+   * Allows accessing field definitions for introspection.
+   */
+  readonly fields: Fields;
+}
+/**
+ * Type that represents any ECHO relation type — a `Type.Type` entity branded
+ * with the relation entity kind, i.e. what `Type.makeRelation(...)` produces.
+ */
+type AnyRelation = Relation<unknown, unknown, unknown>;
+/**
+ * Type that represents any ECHO type-kind entity — a `Type.Type` meta-schema
+ * value (static `Type.Type` or a persisted draft from `db.addType(...)`).
+ * Mirrors {@link AnyObj} / {@link AnyRelation} for the third sibling kind.
+ */
+type AnyType = Type$3<unknown>;
+/**
+ * Any ECHO type-entity — one of the three sibling kinds: object-kind, relation-kind,
+ * or type-kind (the meta-schema). APIs that want "any ECHO type" use this union;
+ * the underlying Effect Schema is retrieved via `Type.getSchema`.
+ */
+type AnyEntity$1 = AnyObj | AnyRelation | AnyType;
+/**
+ * String key used to phantom-carry the instance type produced by a `Type.Type`.
+ * Used by `Type.InstanceType<typeof Foo>` to recover the schema instance type
+ * since `Type.makeObject(dxn)` does not return a `Schema.Schema`.
+ *
+ * Re-exported from the internal types layer so both `Type.ts` and internal
+ * helpers (`makeObject`, `createObject`) reference the same phantom key.
+ */
+declare const InstancePhantomId: "~@dxos/echo/Type.Instance";
+type InstancePhantomId = InstancePhantomId$1;
+/**
+ * Sibling of {@link Obj} / {@link Relation} for the third ECHO entity kind:
+ * **type-kind** entities (meta-schemas). The singleton {@link Type} const is
+ * the canonical example — it describes stored type definitions themselves.
+ *
+ * Not a `Schema.Schema`. Use `Type.getSchema(value)` to obtain the underlying
+ * Effect Schema and `Type.update(value, draft => ...)` to mutate.
+ *
+ * `A` is the instance-type phantom — what `Obj.make(value, ...)` would produce.
+ * Merged with the `Type` const value via TypeScript declaration merging.
+ */
+interface Type$3<A$1 = unknown> extends BaseTypeEntity<A$1 & OfKind<typeof Kind.Type>> {
+  /** Schema-kind brand (type — the meta-schema kind). */
+  readonly [SchemaKindId]: EntityKind.Type;
+  /** Source Effect Schema — used internally by `Type.getSchema(self)`. */
+  readonly [StaticTypeSchemaSlot]: Schema.AnyNoContext;
+}
+/**
+ * Instance type produced by a Type entity.
+ *
+ * Accepts ONLY {@link AnyEntity} inputs — `Type.Obj`, `Type.Relation`, or
+ * `Type.Type`. Raw Effect `Schema.Schema` values are rejected: for those, use
+ * `Schema.Schema.Type<typeof Foo>` directly. This separation keeps the type
+ * system honest about which values represent ECHO entities versus plain
+ * Effect schemas.
+ *
+ * Dispatches on the entity kind:
+ *  - `Relation<Props, S, T>` → `Endpoints<S,T> & Props & OfKind<Relation>`
+ *  - `Obj<A>`                → `A & OfKind<Object>`
+ *  - `Type<A>`               → `A & OfKind<Type>`
+ */
+type InstanceType$1<T$1 extends AnyEntity$1> = T$1 extends Relation<infer Props, infer Source, infer Target, any> ? Endpoints$1<Source, Target> & Props & OfKind<typeof Kind.Relation> : T$1 extends Obj$1<infer A, any> ? A & OfKind<typeof Kind.Object> : T$1 extends Type$3<infer A> ? A & OfKind<typeof Kind.Type> : never;
+//#endregion
+//#region ../echo/dist/types/src/internal/Ref/ref.d.ts
+declare const RefTypeId: unique symbol;
+/**
+ * Reference Schema.
+ */
+interface RefSchema$1<T$1 extends AnyEntity> extends SchemaClass<Ref<T$1>, EncodedReference> {}
+/**
+ * Type of the `Ref` function and extra methods attached to it.
+ */
+interface RefFn {
+  <S$1 extends AnyEntity$1 | UnknownTypeSchema<any, any> = AnyEntity$1>(schema: S$1): RefSchema$1<S$1 extends AnyType ? AnyEntity$1 : S$1 extends AnyObj | AnyRelation ? InstanceType$1<S$1> : S$1 extends UnknownTypeSchema<infer A, any> ? A : never>;
+  /**
+   * @returns True if the object is a reference.
+   */
+  isRef: (obj: unknown) => obj is Ref<any>;
+  /**
+   * @returns True if the reference points to the given object id.
+   */
+  hasEntityId: (id: EntityId) => (ref: Ref<any>) => boolean;
+  /**
+   * @returns True if the schema is a reference schema.
+   */
+  isRefSchema: (schema: Schema<any, any>) => schema is RefSchema$1<any>;
+  /**
    * @returns True if the schema AST is a reference schema.
    */
   isRefSchemaAST: (ast: AST) => boolean;
@@ -8711,9 +9244,10 @@ interface RefFn {
    */
   make: <T$1 extends AnyEntity>(object: T$1) => Ref<T$1>;
   /**
-   * Constructs a reference that points to the object specified by the provided DXN.
+   * Constructs a reference that points to the object specified by the provided URI
+   * (either an `echo:` EID for an object reference or a `dxn:` DXN for a type reference).
    */
-  fromDXN: (dxn: DXN) => Ref<any>;
+  fromURI: (uri: URI) => Ref<any>;
 }
 /**
  * Schema builder for references.
@@ -8725,9 +9259,9 @@ declare const Ref: RefFn;
  */
 interface Ref<T$1> extends Pipeable {
   /**
-   * Target object DXN.
+   * Target URI (either an `echo:` EID for an object reference or a `dxn:` DXN for a type reference).
    */
-  get dxn(): DXN;
+  get uri(): URI;
   /**
    * Returns true if the reference has a target available (inlined or resolver set).
    */
@@ -8794,16 +9328,24 @@ interface RefResolver {
   /**
    * Resolve ref synchronously from the objects in the working set.
    *
-   * @param dxn
+   * @param uri
    * @param load If true the resolver should attempt to load the object from disk.
    * @param onLoad Callback to call when the object is loaded.
    */
-  resolveSync(dxn: DXN, load: boolean, onLoad?: () => void): AnyProperties | undefined;
+  resolveSync(uri: URI, load: boolean, onLoad?: () => void): AnyProperties | undefined;
   /**
    * Resolver ref asynchronously.
    */
-  resolve(dxn: DXN): Promise<AnyProperties | undefined>;
-  resolveSchema(dxn: DXN): Promise<Schema.AnyNoContext | undefined>;
+  resolve(uri: URI): Promise<AnyProperties | undefined>;
+  resolveSchema(uri: URI): Promise<Schema.AnyNoContext | undefined>;
+  /**
+   * Resolve the source `Type.AnyEntity` entity for a type URI. Used by
+   * deserialization paths (`Obj.fromJSON`) to set the back-reference accessed
+   * via `Obj.getType` / `Entity.getType`. Optional — resolvers that only
+   * carry raw schemas may leave this unimplemented; the deserializer falls
+   * back to leaving the type entity unset.
+   */
+  resolveType?(uri: URI): Promise<unknown | undefined>;
 }
 //#endregion
 //#region ../echo/dist/types/src/Ref.d.ts
@@ -8835,10 +9377,14 @@ type Unknown$2 = Ref<Unknown$1>;
  * ```ts
  * const Task = Schema.Struct({
  *   assignee: Ref.Ref(Person),  // Creates a Ref schema
- * }).pipe(Type.object({ typename: 'Task', version: '0.1.0' }));
+ * }).pipe(Type.makeObject(DXN.make('com.example.type.task', '0.1.0')));
  * ```
  */
-declare const Ref$1: <S$1 extends Schema.Any>(schema: S$1) => RefSchema<Schema.Type<S$1>>;
+declare const Ref$1: {
+  <S$1 extends AnyObj | AnyRelation>(type: S$1): RefSchema<InstanceType$1<S$1> & Unknown$1>;
+  <T$1 extends Type$3<any>>(type: T$1): RefSchema<InstanceType$1<T$1>>;
+  <S$1 extends UnknownTypeSchema<any, any>>(schema: S$1): RefSchema<Schema.Type<S$1> & Unknown$1>;
+};
 /**
  * TypeScript type for a Ref schema.
  * This is the type of the SCHEMA itself, not the runtime ref instance.
@@ -8857,265 +9403,12 @@ interface RefSchema<T$1 extends Unknown> extends RefSchema$1<T$1> {}
 /**
  * Extract reference target.
  */
-type Target<R$1 extends Unknown$2> = R$1 extends Ref<infer T> ? T : never;
+type Target$1<R$1 extends Unknown$2> = R$1 extends Ref<infer T> ? T : never;
 /**
  * Reference resolver.
  */
 type Resolver = RefResolver;
 //#endregion
-//#region ../echo/dist/types/src/internal/Obj/typed-object.d.ts
-/**
- * Definition for an object type that can be stored in an ECHO database.
- * Implements effect schema to define object properties.
- * Has a typename and version.
- *
- * In contrast to {@link EchoSchema} this definition is not recorded in the database.
- *
- * @deprecated Use `Type.AnyObj` from `@dxos/echo` instead.
- */
-interface TypedObject<A$1 = any, I$1 = any> extends TypeMeta, Schema<A$1, I$1> {}
-/**
- * Typed object that could be used as a prototype in class definitions.
- * This is an internal API type.
- *
- * @deprecated Use `Type.AnyObj` from `@dxos/echo` instead.
- */
-interface TypedObjectPrototype<A$1 = any, I$1 = any> extends TypedObject<A$1, I$1> {
-  /** Type constructor. */
-  new (): AnyEntity & A$1;
-}
-//#endregion
-//#region ../echo/dist/types/src/internal/Type/persistent-schema.d.ts
-/**
- * Persistent representation of a schema.
- */
-declare const PersistentSchema: EchoObjectSchema<Struct<{
-  name: optional<typeof String$>;
-  typename: refine<string, typeof String$>;
-  version: refine<string, typeof String$>;
-  jsonSchema: Schema<JsonSchemaType, JsonSchemaType, never>;
-}>, Readonly<{
-  name: optional<typeof String$>;
-  typename: refine<string, typeof String$>;
-  version: refine<string, typeof String$>;
-  jsonSchema: Schema<JsonSchemaType, JsonSchemaType, never>;
-}>>;
-interface PersistentSchema extends Schema.Type<typeof PersistentSchema> {}
-//#endregion
-//#region ../echo/dist/types/src/internal/Type/echo-schema.d.ts
-/**
- * Base schema type.
- */
-interface BaseSchema<A$1 = any, I$1 = any> extends TypedObject<A$1, I$1> {
-  get readonly(): boolean;
-  get mutable(): EchoSchema<A$1, I$1>;
-  get snapshot(): Schema<A$1, I$1>;
-  get jsonSchema(): JsonSchemaType;
-}
-declare const EchoSchema_base: TypedObjectPrototype<any, any>;
-/**
- * Represents a schema that is persisted in the ECHO database.
- * Schema can me mutable or readonly (specified by the {@link EchoSchema.readonly} field).
- *
- * Schema that can be modified at runtime via the API.
- * Is an instance of effect-schema (`Schema.Schema.AnyNoContext`) so it can be used in the same way as a regular schema.
- * IMPORTANT: The schema AST will change reactively when the schema is updated, including synced updates from remote peers.
- *
- * The class constructor is a schema instance itself, and can be used in the echo object definitions:
- *
- * @example
- * ```ts
- * export class TableType extends Schema.Struct({...}).pipe(Type.object({ typename: 'com.example.type.table', version: '0.1.0' })){
- *   title: Schema.String,
- *   schema: Schema.optional(ref(EchoSchema)),
- *   props: Schema.mutable(S.Array(TablePropSchema)),
- * }) {}
- * ```
- *
- * The ECHO API will translate any references to PersistentSchema objects to be resolved as EchoSchema objects.
- */
-declare class EchoSchema<A$1 = any, I$1 = any> extends EchoSchema_base implements BaseSchema<A$1, I$1> {
-  private readonly _persistentSchema;
-  private _schema;
-  private _isDirty;
-  /**
-   * Schema kind key that marks this as an ECHO schema.
-   * Makes EchoSchema satisfy the Type.AnyObj type.
-   */
-  readonly [SchemaKindId]: EntityKind.Object;
-  constructor(_persistentSchema: PersistentSchema);
-  get [TypeId$1](): {
-    _A: (_: any) => any;
-    _I: (_: any) => any;
-    _R: (_: never) => never;
-  };
-  get Type(): A$1;
-  get Encoded(): I$1;
-  get Context(): never;
-  get ast(): AST;
-  get annotations(): (annotations: Annotations.GenericSchema<any>) => Schema<any, any, never>;
-  get pipe(): Schema.AnyNoContext['pipe'];
-  get kind(): EntityKind.Object;
-  get typename(): string;
-  get version(): string;
-  get readonly(): boolean;
-  /**
-   * Returns an immutable schema snapshot of the current state of the schema.
-   */
-  get snapshot(): Schema.AnyNoContext;
-  /**
-   * Returns the JSON schema for the schema.
-   */
-  get jsonSchema(): JsonSchemaType;
-  /**
-   * Returns a mutable schema.
-   */
-  get mutable(): EchoSchema;
-  /**
-   * Id of the ECHO object containing the schema.
-   */
-  get id(): ObjectId;
-  /**
-   * Short name of the schema.
-   */
-  get name(): string | undefined;
-  get [SchemaMetaSymbol](): SchemaMeta;
-  /**
-   * Reference to the underlying persistent schema object.
-   */
-  get persistentSchema(): PersistentType;
-  getProperties(): PropertySignature$1[];
-  /**
-   * @throws Error if the schema is readonly.
-   */
-  updateTypename(typename: string): void;
-  /**
-   * @throws Error if the schema is readonly.
-   */
-  addFields(fields: Struct.Fields): void;
-  /**
-   * @throws Error if the schema is readonly.
-   */
-  updateFields(fields: Struct.Fields): void;
-  /**
-   * @throws Error if the schema is readonly.
-   */
-  updateFieldPropertyName({
-    before,
-    after
-  }: {
-    before: PropertyKey;
-    after: PropertyKey;
-  }): void;
-  /**
-   * @throws Error if the schema is readonly.
-   */
-  removeFields(fieldNames: string[]): void;
-  /**
-   * Wrapper for Obj.update that handles the change context for the persistent schema.
-   */
-  private _change;
-  /**
-   * Called by DatabaseSchemaRegistry on update.
-   */
-  _invalidate(): void;
-  /**
-   * Rebuilds this schema if it is dirty.
-   */
-  _rebuild(): void;
-  _getSchema(): Schema.AnyNoContext;
-}
-//#endregion
-//#region ../echo/dist/types/src/Relation.d.ts
-type Endpoints$1<Source, Target$1> = {
-  [Source]: Source;
-  [Target$1]: Target$1;
-};
-/**
- * Get relation source type.
- */
-type SourceOf<A$1> = A$1 extends Endpoints$1<infer S, infer _T> ? S : never;
-/**
- * Get relation target type.
- */
-type TargetOf<A$1> = A$1 extends Endpoints$1<infer _S, infer T> ? T : never;
-//#endregion
-//#region ../echo/dist/types/src/Type.d.ts
-/**
- * Dynamic type that can be constructed, mutated, and persisted in the ECHO database.
- */
-declare const RuntimeType: typeof EchoSchema;
-/**
- * Dynamic type that can be constructed, mutated, and persisted in the ECHO database.
- */
-type RuntimeType = EchoSchema;
-/**
- * Type that marks a schema as an ECHO schema.
- * The value indicates the entity kind (Object or Relation).
- */
-type EchoSchemaKind<K$1 extends EntityKind = EntityKind> = {
-  readonly [SchemaKindId]: K$1;
-};
-/**
- * TypeScript type for an ECHO object schema.
- * `T` is the instance type produced by the schema.
- * `Fields` is the optional struct fields type for introspection.
- *
- * @example
- * ```ts
- * const PersonSchema: Type.Obj<Person> = Schema.Struct({
- *   name: Schema.String,
- * }).pipe(Type.object({ typename: 'Person', version: '0.1.0' }));
- *
- * // Access fields for introspection:
- * Object.keys(PersonSchema.fields); // ['name']
- * ```
- */
-interface Obj$1<T$1, Fields extends Struct.Fields = Struct.Fields> extends TypeMeta, EchoSchemaKind<EntityKind.Object>, AnnotableClass<Obj$1<T$1, Fields>, OfKind<typeof Kind.Object> & T$1, Simplify<BaseObjJson & ToMutable<T$1>>, never> {
-  /**
-   * The fields defined in the original struct schema.
-   * Allows accessing field definitions for introspection.
-   */
-  readonly fields: Fields;
-}
-/**
- * Structural base type for any ECHO object schema.
- * Accepts both static schemas (created with Type.object()) and EchoSchema.
- * NOTE: Does not include the brand symbol to avoid TS4053 declaration portability issues.
- * Use Type.isObjectSchema() for runtime type guards.
- */
-type ObjectSchemaBase = Schema.AnyNoContext & {
-  readonly typename: string;
-  readonly version: string;
-};
-/**
- * Type that represents any ECHO object schema.
- * Accepts both static schemas (Type.object()) and mutable schemas (EchoSchema).
- */
-type AnyObj = ObjectSchemaBase;
-declare const PersistentType: Obj$1<PersistentSchema>;
-interface PersistentType extends Schema.Type<typeof PersistentType> {}
-/**
- * Structural base type for any ECHO relation schema.
- * Accepts static schemas (created with Type.relation()).
- * NOTE: Does not include the brand symbol to avoid TS4053 declaration portability issues.
- * Use Type.isRelationSchema() for runtime type guards.
- */
-type RelationSchemaBase = Schema.AnyNoContext & {
-  readonly typename: string;
-  readonly version: string;
-};
-/**
- * Type that represents any ECHO relation schema.
- * Accepts static schemas (Type.relation()).
- */
-type AnyRelation = RelationSchemaBase;
-/**
- * Type alias for any ECHO entity schema (object or relation).
- * Use this in type annotations for schema parameters.
- */
-type AnyEntity$1 = AnyObj | AnyRelation;
-//#endregion
 //#region ../echo/dist/types/src/Obj.d.ts
 /**
  * Base type for all ECHO objects.
@@ -9124,7 +9417,7 @@ interface BaseObj extends AnyEntity, OfKind<typeof Kind.Object> {}
 /**
  * Object type with specific properties.
  */
-type OfShape<Props$1> = BaseObj & Props$1;
+type OfShape<Props$2> = BaseObj & Props$2;
 /**
  * Object with no known properties beyond id and kind.
  * Use this when the object's schema/properties are not known.
@@ -9152,18 +9445,12 @@ interface Unknown$1 extends BaseObj {}
  * // Reference to any object type
  * const Collection = Schema.Struct({
  *   objects: Schema.Array(Ref.Ref(Obj.Unknown)),
- * }).pipe(Type.object({ typename: 'Collection', version: '0.1.0' }));
+ * }).pipe(Type.makeObject(DXN.make('com.example.type.collection', '0.1.0')));
  * ```
  */
-declare const Unknown$1: Obj$1<Unknown$1>;
-/**
- * JSON-encoded properties for objects.
- */
-interface BaseObjJson {
-  id: string;
-}
+declare const Unknown$1: UnknownTypeSchema<Unknown$1, typeof Kind.Object>;
 declare namespace Filter_d_exports {
-  export { Any$3 as Any, ChildOfOptions, Filter, KeyFilterOptions, Props, TextSearchOptions, Type$2 as Type, and, between, childOf, contains, created, eq, everything, foreignKeys, fromAst$1 as fromAst, gt, gte, id, in$ as in, is$1 as is, key$1 as key, lt, lte, neq, not, nothing, or, pretty$1 as pretty, props, tag, text, type$2 as type, typeDXN, typename$1 as typename, updated };
+  export { Any$3 as Any, ChildOfOptions, Filter, KeyFilterOptions, Props$1 as Props, TextSearchOptions, Type$2 as Type, and, between, childOf, contains, created, eq, everything, foreignKeys, fromAst$1 as fromAst, gt, gte, id, in$ as in, is$1 as is, key$1 as key, lt, lte, neq, not, nothing, or, pretty$1 as pretty, props, tag, text, type$2 as type, typeURI, typename, updated };
 }
 interface Filter<T$1> {
   '~Filter': {
@@ -9171,7 +9458,7 @@ interface Filter<T$1> {
   };
   ast: Filter$1;
 }
-type Props<T$1> = { [K in keyof T$1 & string]?: Filter<T$1[K]> | T$1[K] };
+type Props$1<T$1> = { [K in keyof T$1 & string]?: Filter<T$1[K]> | T$1[K] };
 type Any$3 = Filter<any>;
 type Type$2<F extends Any$3> = F extends Filter<infer T> ? T : never;
 declare class FilterClass implements Any$3 {
@@ -9193,19 +9480,30 @@ declare const everything: () => FilterClass;
  * Filter that matches no objects.
  */
 declare const nothing: () => FilterClass;
-declare const id: (...ids: ObjectId[]) => Any$3;
+declare const id: (...ids: EntityId[]) => Any$3;
 /**
  * Filter by type.
+ *
+ * Accepts a `Type.Type` entity (the value produced by `Type.makeObject` /
+ * `Type.makeRelation`), a `Schema.Union` of such entities (for filtering across a
+ * union of ECHO types), or a non-qualified typename string.
  */
-declare const type$2: <S$1 extends Schema.All>(schema: S$1 | string, props?: Props<Schema.Type<S$1>>) => Filter<Schema.Type<S$1>>;
+declare const type$2: {
+  <T$1 extends AnyEntity$1>(type: T$1, props?: Props$1<InstanceType$1<T$1>>): Filter<InstanceType$1<T$1>>;
+  <S$1 extends UnknownTypeSchema<any, any>>(schema: S$1, props?: Props$1<Schema.Type<S$1>>): Filter<Schema.Type<S$1>>;
+  <S$1 extends Union<readonly Schema.AnyNoContext[]>>(union: S$1, props?: Props$1<Schema.Type<S$1>>): Filter<Schema.Type<S$1>>;
+  (schema: string, props?: Props$1<unknown>): Filter<any>;
+  (input: AnyEntity$1 | string, props?: Props$1<unknown>): Filter<unknown>;
+};
 /**
  * Filter by non-qualified typename.
  */
-declare const typename$1: (typename: string) => Any$3;
+declare const typename: (typename: string) => Any$3;
 /**
- * Filter by fully qualified type DXN.
+ * Filter by fully qualified type URI — either a typename DXN (for static schemas) or
+ * a schema-as-object EID (for stored dynamic schemas). See `getSchemaURI`.
  */
-declare const typeDXN: (dxn: DXN) => Any$3;
+declare const typeURI: (uri: URI) => Any$3;
 /**
  * Filter by tag.
  */
@@ -9234,7 +9532,7 @@ declare const key$1: (key: string, options?: KeyFilterOptions) => Any$3;
 /**
  * Filter by properties.
  */
-declare const props: <T$1>(props: Props<T$1>) => Filter<T$1>;
+declare const props: <T$1>(props: Props$1<T$1>) => Filter<T$1>;
 type TextSearchOptions = {
   type?: 'full-text' | 'vector';
 };
@@ -9245,7 +9543,7 @@ declare const text: (text: string, options?: TextSearchOptions) => Any$3;
 /**
  * Filter by foreign keys.
  */
-declare const foreignKeys: <S$1 extends Schema.All>(schema: S$1 | string, keys: ForeignKey[]) => Filter<Schema.Type<S$1>>;
+declare const foreignKeys: <S$1 extends AnyEntity$1 | string>(schema: S$1, keys: ForeignKey[]) => Filter<S$1 extends AnyEntity$1 ? InstanceType$1<S$1> : unknown>;
 /**
  * Predicate for property to be equal to the provided value.
  */
@@ -9305,7 +9603,7 @@ type ChildOfOptions = {
 /**
  * Filter objects that are children of the specified parent(s).
  * Accepts ECHO objects, Refs, or arrays of either.
- * Refs are resolved to DXNs without loading; objects use {@link Obj.getDXN}.
+ * Refs are resolved to DXNs without loading; objects use {@link Obj.getURI}.
  * With transitive=true (default), also matches grandchildren and beyond.
  */
 declare const childOf: (parents: Unknown$1 | Unknown$2 | readonly (Unknown$1 | Unknown$2)[], options?: ChildOfOptions) => Any$3;
@@ -9326,12 +9624,15 @@ declare const or: <Filters extends readonly Any$3[]>(...filters: Filters) => Fil
  */
 declare const pretty$1: (filter: Any$3) => string;
 //#endregion
-//#region ../echo/dist/types/src/JsonSchema.d.ts
+//#region ../echo/dist/types/src/Collection.d.ts
 /**
- * Serializable JsonSchema type definition.
+ * A an ordered set of objects.
  */
-type JsonSchema = JsonSchemaType;
-declare const JsonSchema: Schema<JsonSchemaType>;
+declare const Collection: Obj$1<{
+  readonly name?: string | undefined;
+  readonly objects: readonly Ref<Unknown$1>[];
+}, Struct.Fields>;
+type Collection = InstanceType$1<typeof Collection>;
 //#endregion
 //#region ../echo/dist/types/src/QueryResult.d.ts
 /**
@@ -9408,155 +9709,6 @@ interface QueryResult<T$1> {
   subscribe(callback?: (query: QueryResult<T$1>) => void, opts?: SubscriptionOptions): CleanupFn;
 }
 //#endregion
-//#region ../echo/dist/types/src/SchemaRegistry.d.ts
-type Query$1 = {
-  /**
-   * Filter by schema ID.
-   * Schema id is a DXN with `echo` or `type` kind.
-   */
-  id?: string | string[];
-  /**
-   * Id of the backing ECHO object.
-   */
-  backingObjectId?: ObjectId | ObjectId[];
-  /**
-   * One or more typenames to filter by.
-   */
-  typename?: string | string[];
-  /**
-   * [Semver Range](https://docs.npmjs.com/cli/v6/using-npm/semver#ranges) for the schema version.
-   */
-  version?: string;
-  /**
-   * Where to look for the schema.
-   *
-   * Database schema are stored in the database of the current space.
-   * Runtime schema are registered in the runtime.
-   *
-   * @default ['database']
-   */
-  location?: ('database' | 'runtime')[];
-  /**
-   * Include system schemas.
-   * @default false
-   *
-   * The system schema include but are not limited to:
-   *  - org.dxos.type.schema
-   */
-  includeSystem?: boolean;
-};
-/**
- * Input for schema registration.
- * The typename, version and schema mutability metadata is read from the schema annotations.
- *
- * Accepts:
- * - Branded ECHO schemas created with Type.Obj() or Type.Relation()
- * - JSON schema with typename and version
- */
-type RegisterSchemaInput = AnyEntity$1 | {
-  typename: string;
-  version: string;
-  jsonSchema: JsonSchema;
-  /**
-   * Display name of the schema.
-   */
-  name?: string;
-};
-type ExtractQueryResult<Query$3> = Query$3 extends {
-  location: ('database' | 'runtime')[];
-} ? AnyEntity$1 : RuntimeType;
-interface SchemaRegistry {
-  /**
-   * Checks if the provided schema is registered.
-   */
-  hasSchema(schema: AnyEntity$1): boolean;
-  /**
-   * Registers the provided schema.
-   *
-   * @returns Mutable runtime instances of schemas that were registered.
-   *
-   * The behavior of this method depends on the state of the database.
-   * The general principle is that the schema will be upserted into the space.
-   * If an equivalent schema with the same name and version already exists, the method does nothing.
-   * If a different schema with the same name and version exists, the method throws an error.
-   * If no schema with the same name and version exists, a new schema will be inserted based on semantic versioning rules.
-   */
-  register(input: RegisterSchemaInput[]): Promise<RuntimeType[]>;
-  /**
-   *
-   */
-  query<Q extends NoExcessProperties<Query$1, Q>>(query?: Q & Query$1): QueryResult<ExtractQueryResult<Q>>;
-}
-//#endregion
-//#region ../echo/dist/types/src/Hypergraph.d.ts
-/**
- * Resolution context.
- * Affects how non-absolute DXNs are resolved.
- */
-interface RefResolutionContext {
-  /**
-   * Space that the resolution is happening from.
-   */
-  space?: SpaceId;
-  /**
-   * Feed that the resolution is happening from (as the underlying queue DXN).
-   * This feed will be searched first, and then the space it belongs to.
-   */
-  feed?: DXN;
-}
-interface RefResolverOptions {
-  /**
-   * Resolution context.
-   * Affects how non-absolute DXNs are resolved.
-   */
-  context?: RefResolutionContext;
-  /**
-   * Middleware to change the resolved object before returning it.
-   * @deprecated On track to be removed.
-   */
-  middleware?: (obj: AnyProperties) => AnyProperties;
-}
-/**
- * Manages cross-space database interactions.
- */
-interface Hypergraph extends Queryable {
-  get schemaRegistry(): SchemaRegistry;
-  /**
-   * Query objects.
-   */
-  query: QueryFn;
-  /**
-   * Creates a reference to an existing object in the database.
-   *
-   * NOTE: The reference may be dangling if the object is not present in the database.
-   * NOTE: Difference from `Ref.fromDXN`
-   * `Ref.fromDXN(dxn)` returns an unhydrated reference. The `.load` and `.target` APIs will not work.
-   * `db.makeRef(dxn)` is preferable in cases with access to the database.
-   */
-  makeRef<T$1 extends Unknown = Unknown>(dxn: DXN): Ref$1<T$1>;
-  /**
-   * @param hostDb Host database for reference resolution.
-   * @param middleware Called with the loaded object. The caller may change the object.
-   * @returns Result of `onLoad`.
-   */
-  createRefResolver(options: RefResolverOptions): Resolver;
-  /**
-   * Get a database by space ID.
-   * @returns The database for the given space ID, or undefined if not found.
-   */
-  getDatabase(spaceId: SpaceId): Database | undefined;
-}
-//#endregion
-//#region ../echo/dist/types/src/Collection.d.ts
-/**
- * A an ordered set of objects.
- */
-declare const Collection: Obj$1<{
-  readonly name?: string | undefined;
-  readonly objects: readonly Ref<OfKind<EntityKind.Object> & Unknown$1>[];
-}, Struct.Fields>;
-interface Collection extends Schema.Type<typeof Collection> {}
-//#endregion
 //#region ../echo/dist/types/src/Feed.d.ts
 /**
  * Runtime schema for a Feed object.
@@ -9574,7 +9726,7 @@ declare const Feed: Obj$1<{
 /**
  * TypeScript instance type for a Feed object.
  */
-interface Feed extends Schema.Type<typeof Feed> {}
+type Feed = InstanceType$1<typeof Feed>;
 //#endregion
 //#region ../echo/dist/types/src/View.d.ts
 /**
@@ -9597,25 +9749,32 @@ declare const ViewSchema: Obj$1<{
     readonly pivotFieldId?: string | undefined;
   };
 }, Struct.Fields>;
-interface View extends Schema.Type<typeof ViewSchema> {}
-/**
- * View instance type.
- */
+interface View extends InstanceType$1<typeof ViewSchema> {}
 declare const View: Obj$1<View>;
 //#endregion
 //#region ../echo/dist/types/src/Dataset.d.ts
 /**
- * Abstart set of objects, represented by a view, feed, or collection.
+ * Abstract set of objects, represented by a view, feed, or collection.
+ * Schema-level union of the underlying type entities (rebuilt via
+ * `Type.getSchema`) so this can still be consumed by Schema-side APIs such
+ * as `Filter.type(...)` on a union.
  */
-declare const Dataset: Union<[Obj$1<{
+type Dataset = Feed | Collection | View;
+declare const Dataset: Union<[Schema<{
   readonly name?: string | undefined;
   readonly kind?: string | undefined;
   readonly namespace?: "data" | "trace" | undefined;
-}, Struct.Fields>, Obj$1<{
+} & OfKind<EntityKind.Object>, {
   readonly name?: string | undefined;
-  readonly objects: readonly Ref<OfKind<EntityKind.Object> & Unknown$1>[];
-}, Struct.Fields>, Obj$1<View, Struct.Fields>]>;
-type Dataset = Feed | Collection | View;
+  readonly kind?: string | undefined;
+  readonly namespace?: "data" | "trace" | undefined;
+} & OfKind<EntityKind.Object>, never>, Schema<{
+  readonly name?: string | undefined;
+  readonly objects: readonly Ref<Unknown$1>[];
+} & OfKind<EntityKind.Object>, {
+  readonly name?: string | undefined;
+  readonly objects: readonly Ref<Unknown$1>[];
+} & OfKind<EntityKind.Object>, never>, Schema<View & OfKind<EntityKind.Object>, View & OfKind<EntityKind.Object>, never>]>;
 declare namespace Order_d_exports {
   export { Any$2 as Any, Order, natural, property, rank };
 }
@@ -9644,28 +9803,28 @@ interface Query<T$1> {
   '~Query': {
     value: T$1;
   };
-  ast: Query$2;
+  ast: Query$1;
   /**
    * Filter the current selection based on a filter.
    * @param filter - Filter to select the objects.
    * @returns Query for the selected objects.
    */
   'select'(filter: Filter<T$1>): Query<T$1>;
-  'select'(props: Props<T$1>): Query<T$1>;
+  'select'(props: Props$1<T$1>): Query<T$1>;
   /**
    * Traverse an outgoing reference.
    * @param key - Property path inside T that is a reference or optional reference.
    * @returns Query for the target of the reference.
    */
-  'reference'<K$1 extends RefPropKey<T$1>>(key: K$1): Query<T$1[K$1] extends Unknown$2 ? Target<T$1[K$1]> : T$1[K$1] extends Unknown$2 | undefined ? Target<Exclude<T$1[K$1], undefined>> : never>;
+  'reference'<K$1 extends RefPropKey<T$1>>(key: K$1): Query<T$1[K$1] extends Unknown$2 ? Target$1<T$1[K$1]> : T$1[K$1] extends Unknown$2 | undefined ? Target$1<Exclude<T$1[K$1], undefined>> : never>;
   /**
    * Find objects referencing this object.
    * @param target - Schema of the referencing object. If not provided, matches any type.
    * @param key - Property path inside the referencing object that is a reference. If not provided, matches any property.
    * @returns Query for the referencing objects.
    */
-  'referencedBy'<S$1 extends Schema.All>(target: S$1 | string, key: RefPropKey<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
-  'referencedBy'<S$1 extends Schema.All>(target: S$1 | string): Query<Schema.Type<S$1>>;
+  'referencedBy'<S$1 extends AnyEntity$1>(target: S$1 | string, key: RefPropKey<InstanceType$1<S$1>>): Query<InstanceType$1<S$1>>;
+  'referencedBy'<S$1 extends AnyEntity$1>(target: S$1 | string): Query<InstanceType$1<S$1>>;
   'referencedBy'(): Query<any>;
   /**
    * Find relations where this object is the source.
@@ -9673,14 +9832,14 @@ interface Query<T$1> {
    * @param relation - Schema of the relation.
    * @param predicates - Predicates to filter the relation objects.
    */
-  'sourceOf'<S$1 extends Schema.All>(relation?: S$1 | string, predicates?: Props<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
+  'sourceOf'<R$1 extends AnyRelation>(relation?: R$1 | string, predicates?: Props$1<InstanceType$1<R$1>>): Query<InstanceType$1<R$1>>;
   /**
    * Find relations where this object is the target.
    * @returns Query for the relation objects.
-   * @param relation - Schema of the relation.
+   * @param relation - Type entity of the relation.
    * @param predicates - Predicates to filter the relation objects.
    */
-  'targetOf'<S$1 extends Schema.All>(relation?: S$1 | string, predicates?: Props<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
+  'targetOf'<R$1 extends AnyRelation>(relation?: R$1 | string, predicates?: Props$1<InstanceType$1<R$1>>): Query<InstanceType$1<R$1>>;
   /**
    * For a query for relations, get the source objects.
    * @returns Query for the source objects.
@@ -9775,9 +9934,19 @@ interface Query<T$1> {
    */
   'from'(query: Any$1): Query<T$1>;
   /**
-   * Query from a raw scope specification.
+   * Query from one or more raw scopes.
+   *
+   * Use the {@link Scope} constructors rather than raw tagged objects:
+   *
+   * ```ts
+   * Query.select(Filter.type(Type.Type)).from(Scope.space(), Scope.registry());
+   * ```
+   */
+  'from'(...scopes: Scope[]): Query<T$1>;
+  /**
+   * Query from a raw scope or array of scopes.
    */
-  'from'(scope: Scope): Query<T$1>;
+  'from'(scope: Scope | Scope[]): Query<T$1>;
   /**
    * Add options to a query.
    */
@@ -9791,7 +9960,7 @@ type Any$1 = Query<any>;
 type Type$1<Q extends Any$1> = Q extends Query<infer T> ? T : never;
 declare const is: (value: unknown) => value is Any$1;
 /** Construct a query from an ast. */
-declare const fromAst: (ast: Query$2) => Any$1;
+declare const fromAst: (ast: Query$1) => Any$1;
 /**
  * Select objects based on a filter.
  * @param filter - Filter to select the objects.
@@ -9807,8 +9976,10 @@ declare const select: <F extends Any$3>(filter: F) => Query<Type$2<F>>;
  * Shorthand for: `Query.select(Filter.type(schema, predicates))`.
  */
 declare const type$1: {
-  <S$1 extends Schema.All>(schema: S$1, predicates?: Props<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
-  (schema: string, predicates?: Props<unknown>): Query<any>;
+  <T$1 extends AnyEntity$1>(type: T$1, predicates?: Props$1<InstanceType$1<T$1>>): Query<InstanceType$1<T$1>>;
+  <S$1 extends UnknownTypeSchema<any, any>>(schema: S$1, predicates?: Props$1<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
+  <S$1 extends Union<readonly Schema.AnyNoContext[]>>(union: S$1, predicates?: Props$1<Schema.Type<S$1>>): Query<Schema.Type<S$1>>;
+  (schema: string, predicates?: Props$1<unknown>): Query<any>;
 };
 /**
  * Combine results of multiple queries.
@@ -9830,14 +10001,169 @@ declare const without: <T$1>(source: Query<T$1>, exclude: Query<T$1>) => Query<T
  * @param source - Data source: database, feed, 'all-accessible-spaces', or another query.
  * @returns Query scoped to the given source.
  */
-declare const from: (source: Database | Database[] | Feed | Feed[] | Any$1 | Scope | 'all-accessible-spaces', options?: {
+declare const from: (...args: [(Database | Database[] | Feed | Feed[] | Any$1 | Scope | Scope[] | 'all-accessible-spaces'), {
   includeFeeds?: boolean;
-}) => Any$1;
+}?] | Scope[]) => Any$1;
 /**
  * Returns a human-readable string representation of a Query AST.
  */
 declare const pretty: (query: Any$1) => string;
 //#endregion
+//#region ../echo/dist/types/src/Registry.d.ts
+/**
+ * Identifier denoting an ECHO Registry.
+ */
+declare const TypeId$1: unique symbol;
+type TypeId$1 = typeof TypeId$1;
+/**
+ * Composable, in-memory registry of keyed ECHO entities.
+ *
+ * Entities are stored by id and queried via the standard ECHO Query API.
+ * A registry may delegate to an optional upstream registry: results from the local
+ * registry take precedence and upstream results fill in anything not found locally.
+ *
+ * Intended use cases include caches of schemas, operations, blueprints, routines, plugins,
+ * etc., sourced from 3rd-party plugins, local code, or local space objects.
+ *
+ * Types (schema-definition entities produced by `Type.makeObject` / `Type.makeRelation`) are
+ * stored the same way as any other entity — via `add()`. Use `list().filter(Type.isType)` to
+ * retrieve them.
+ *
+ * Scope: a Registry is independent of any ECHO space or Hypergraph — it is a process-local,
+ * in-memory cache. Wire one per space (e.g. as a Layer scoped to the space's Effect runtime)
+ * or share a single instance across spaces depending on the use case.
+ *
+ * The concrete implementation (and the `makeRegistry` / `registryLayer` factories) lives in
+ * `@dxos/echo-db`; this module declares only the interface so that the `@dxos/echo` API surface
+ * stays free of query-matching dependencies.
+ */
+interface Registry {
+  readonly [TypeId$1]: TypeId$1;
+  /**
+   * Stable per-instance identifier. Used to key process-local resources (e.g. memoized
+   * reactive atoms) to a specific registry instance, analogous to {@link Database.spaceId}.
+   */
+  readonly id: string;
+  /**
+   * Fires whenever local registry contents change (add, remove, or clear).
+   */
+  readonly changed: ReadOnlyEvent<void>;
+  /**
+   * All locally-stored entities.
+   * Does not include upstream entities — use {@link list} for that.
+   */
+  readonly local: readonly Unknown[];
+  /**
+   * Add or replace one or more entities in the local registry.
+   * Existing entries with the same id are replaced.
+   * Also indexes type entities by DXN for fast lookup.
+   */
+  add(entities: readonly Unknown[]): void;
+  /**
+   * Remove an entity by id from the local registry.
+   * @returns true if an entity was removed, false if it was not found.
+   */
+  remove(id: string): boolean;
+  /**
+   * Remove all locally-stored entities.
+   * Does not affect the upstream registry.
+   */
+  clear(): void;
+  /**
+   * Get an entity by id.
+   * Searches the local registry first, then falls back to the upstream registry.
+   */
+  get(id: string): Unknown | undefined;
+  /**
+   * Get an entity by one of its addressing URIs — a type entity by its typename DXN (or, when
+   * persisted, its identifier EID), a keyed entity by its `dxn:<key>[:<version>]`. Accepts legacy
+   * DXN forms (normalized internally). Searches the local registry first, then falls back to the
+   * upstream registry. Narrow the result with `Type.isType` when a type entity is required.
+   */
+  getByURI(uri: string): Unknown | undefined;
+  /**
+   * List all entities.
+   * Local entities take precedence over upstream entities with the same id.
+   */
+  list(): Unknown[];
+  /**
+   * Run an ECHO query against the registry's entities (implements {@link Database.Queryable}).
+   *
+   * Matching happens in-memory over {@link list}. Scope (`from`) clauses are unwrapped and
+   * ignored — a direct registry query always targets the registry's own entities. The primary
+   * way to query registry contents is still through the database (`db.query(...).from(Scope.registry())`),
+   * which fans the database and registry together; this method is for querying a registry directly.
+   *
+   * Only locally-evaluable AST nodes are supported: `select`, `filter`, `limit`, `from`, `options`,
+   * and boolean combinators. Server-side concerns (order, traversal, text/timestamp filters) throw.
+   */
+  query: QueryFn;
+}
+//#endregion
+//#region ../echo/dist/types/src/Hypergraph.d.ts
+/**
+ * Resolution context.
+ * Affects how non-absolute DXNs are resolved.
+ */
+interface RefResolutionContext {
+  /**
+   * Space that the resolution is happening from.
+   */
+  space?: SpaceId;
+  /**
+   * Feed that the resolution is happening from.
+   * This feed will be searched first, and then the space it belongs to.
+   */
+  feed?: URI;
+}
+interface RefResolverOptions {
+  /**
+   * Resolution context.
+   * Affects how non-absolute DXNs are resolved.
+   */
+  context?: RefResolutionContext;
+  /**
+   * Middleware to change the resolved object before returning it.
+   * @deprecated On track to be removed.
+   */
+  middleware?: (obj: AnyProperties) => AnyProperties;
+}
+/**
+ * Manages cross-space database interactions.
+ */
+interface Hypergraph extends Queryable {
+  /**
+   * In-process registry of keyed objects and static schema types.
+   * Populated at startup via `registry.add(objects)` / `registry.add(schemas)`.
+   * Queries that include no explicit from() clause will fan out to this registry automatically.
+   */
+  get registry(): Registry;
+  /**
+   * Query objects.
+   */
+  query: QueryFn;
+  /**
+   * Creates a reference to an existing object in the database.
+   *
+   * NOTE: The reference may be dangling if the object is not present in the database.
+   * NOTE: Difference from `Ref.fromURI`
+   * `Ref.fromURI(dxn)` returns an unhydrated reference. The `.load` and `.target` APIs will not work.
+   * `db.makeRef(dxn)` is preferable in cases with access to the database.
+   */
+  makeRef<T$1 extends Unknown = Unknown>(uri: URI): Ref$1<T$1>;
+  /**
+   * @param hostDb Host database for reference resolution.
+   * @param middleware Called with the loaded object. The caller may change the object.
+   * @returns Result of `onLoad`.
+   */
+  createRefResolver(options: RefResolverOptions): Resolver;
+  /**
+   * Get a database by space ID.
+   * @returns The database for the given space ID, or undefined if not found.
+   */
+  getDatabase(spaceId: SpaceId): Database | undefined;
+}
+//#endregion
 //#region ../echo/dist/types/src/Database.d.ts
 /**
  * `query` API function declaration.
@@ -9867,6 +10193,17 @@ type AddOptions = {
    */
   placeIn?: ObjectPlacement;
 };
+/**
+ * Rejects Type entities from {@link Database.add} at compile time via their `[KindId]` brand. Used
+ * as `T & RejectTypeEntity<T>` to preserve inference of `T`. Bounding `add` on
+ * `Obj.Unknown | Relation.Unknown` instead would reject broadly-typed instance adds (e.g.
+ * `Entity.Any`, `Obj.OfShape<T>`), forcing casts repo-wide.
+ */
+type RejectTypeEntity<T$1> = T$1 extends {
+  readonly [KindId$1]: EntityKind.Type;
+} ? {
+  __error: 'Type entities must be persisted via db.addType(), not db.add().';
+} : T$1;
 type FlushOptions = {
   /**
    * Write any pending changes to disk.
@@ -9895,8 +10232,13 @@ type TypeId = typeof TypeId;
 interface Database extends Queryable {
   readonly [TypeId]: TypeId;
   get spaceId(): SpaceId;
-  get schemaRegistry(): SchemaRegistry;
   get graph(): Hypergraph;
+  /**
+   * Registry for this database. Delegates type lookups to the shared hypergraph registry.
+   * To persist a schema so it replicates to other clients, add the type entity with
+   * {@link addType} (e.g. `await db.addType(Type.makeObjectFromJsonSchema(...))`).
+   */
+  readonly registry: Registry;
   toJSON(): object;
   /**
    * Return object by local ID.
@@ -9910,15 +10252,26 @@ interface Database extends Queryable {
    * Creates a reference to an existing object in the database.
    *
    * NOTE: The reference may be dangling if the object is not present in the database.
-   * NOTE: Difference from `Ref.fromDXN`
-   * `Ref.fromDXN(dxn)` returns an unhydrated reference. The `.load` and `.target` APIs will not work.
+   * NOTE: Difference from `Ref.fromURI`
+   * `Ref.fromURI(dxn)` returns an unhydrated reference. The `.load` and `.target` APIs will not work.
    * `db.makeRef(dxn)` is preferable in cases with access to the database.
    */
-  makeRef<T$1 extends Unknown = Unknown>(dxn: DXN): Ref<T$1>;
+  makeRef<T$1 extends Unknown = Unknown>(uri: URI): Ref<T$1>;
   /**
-   * Adds object to the database.
+   * Adds an object or relation to the database.
+   *
+   * Only Object and Relation entities are accepted. To persist a Type definition use
+   * {@link addType} — passing a Type entity is rejected at compile time (and at runtime).
    */
-  add<T$1 extends Unknown = Unknown>(obj: T$1, opts?: AddOptions): T$1;
+  add<T$1 extends Unknown = Unknown>(obj: T$1 & RejectTypeEntity<T$1>, opts?: AddOptions): T$1;
+  /**
+   * Persists a Type definition (clones/forks the entity) so it replicates to other peers.
+   *
+   * Runs a conflict query first: if a type with the same typename + version already exists in
+   * this space, the existing persisted entity is returned and no duplicate is created. This is
+   * the only supported way to add Type entities — {@link add} rejects them.
+   */
+  addType<T$1 extends AnyEntity$1>(type: T$1): Promise<T$1>;
   /**
    * Removes object from the database.
    */
@@ -9931,24 +10284,9 @@ interface Database extends Queryable {
 }
 declare const Database: Schema<Database>;
 //#endregion
-//#region ../echo/dist/types/src/internal/Entity/object.d.ts
-/**
- * Object schema type with kind marker.
- */
-type EchoObjectSchema<Self extends Schema.Any, Fields extends Struct.Fields = Struct.Fields> = EchoTypeSchema<Self, {}, EntityKind.Object, Fields>;
-/**
- * Schema for Obj entity types.
- * Pipeable function to add ECHO object annotations to a schema.
- */
-declare const EchoObjectSchema: {
-  (meta: TypeMeta): <Self extends Schema.Any, Fields extends Struct.Fields = Struct.Fields>(self: Self & {
-    fields?: Fields;
-  }) => EchoObjectSchema<Self, Fields>;
-};
-//#endregion
 //#region ../echo/dist/types/src/Entity.d.ts
-declare const KindId$1: "~@dxos/echo/Kind";
-type KindId$1 = typeof KindId;
+declare const KindId: "~@dxos/echo/Kind";
+type KindId = typeof KindId$1;
 declare const Kind: typeof EntityKind;
 type Kind = EntityKind;
 /**
@@ -9956,13 +10294,29 @@ type Kind = EntityKind;
  * NOTE: Needed to make `isRelation` and `isObject` checks work.
  */
 interface OfKind<K$1 extends Kind> {
-  readonly [KindId$1]: K$1;
-  readonly id: ObjectId;
+  readonly [KindId]: K$1;
+  readonly id: EntityId;
 }
 /**
  * Unknown Obj or Relation (reactive).
  */
 interface Unknown extends OfKind<Kind> {}
+/**
+ * Effect Schema for any ECHO entity (object or relation).
+ *
+ * Kind-agnostic counterpart to `Obj.Unknown` / `Relation.Unknown` — validates
+ * the structural shape (id + properties) without constraining `[KindId]`. Used
+ * in operation input schemas that accept any entity flavour (e.g.
+ * `Schema.Array(Entity.Unknown)`).
+ *
+ * The cast bridges the runtime structural schema to the branded `Unknown` type:
+ * `[KindId]` is a symbol brand that can't be expressed in a runtime `Struct`,
+ * so the entity guarantee is carried at the type level only (same approach as
+ * `Obj.Unknown` / `Relation.Unknown`). Unlike those, this is kind-agnostic so it
+ * isn't an `UnknownTypeSchema<_, K>` (there's no single `K`) and carries no
+ * `TypeAnnotation`.
+ */
+declare const Unknown: Schema<Unknown>;
 //#endregion
 //#region ../echo/dist/types/src/internal/common/types/base.d.ts
 /**
@@ -9976,43 +10330,9 @@ type AnyProperties = Record<string, any>;
  * @depreacted Remove, use Entity.Unknown instead.
  */
 interface AnyEntity {
-  readonly id: ObjectId;
-}
-//#endregion
-//#region ../echo/dist/types/src/internal/common/types/entity.d.ts
-/**
- * String key used to identify the kind of an entity instance (object or relation).
- */
-declare const KindId: '~@dxos/echo/Kind';
-type KindId = typeof KindId;
-/**
- * String key used to identify the kind of a schema (object schema or relation schema).
- * Parallels KindId which identifies instance kinds.
- */
-declare const SchemaKindId: '~@dxos/echo/SchemaKind';
-type SchemaKindId = typeof SchemaKindId;
-/**
- * Kinds of entities stored in ECHO: objects and relations.
- */
-declare enum EntityKind {
-  Object = "object",
-  Relation = "relation",
+  readonly id: EntityId;
 }
 //#endregion
-//#region ../echo/dist/types/src/internal/Annotation/annotations.d.ts
-declare const TypeMeta: Struct<{
-  typename: refine<string, typeof String$>;
-  version: refine<string, typeof String$>;
-}>;
-interface TypeMeta extends Schema.Type<typeof TypeMeta> {}
-/**
- * SchemaMeta.
- */
-declare const SchemaMetaSymbol: unique symbol;
-type SchemaMeta = TypeMeta & {
-  id: string;
-};
-//#endregion
 //#region src/query-lite/query-lite.d.ts
 declare const Order2: typeof Order_d_exports;
 declare const Filter1: typeof Filter_d_exports;