@sixb/core 0.1.12 → 0.1.13

package/dist/runtime/types.d.ts

@@ -14,10 +14,11 @@ import type { EmbeddingModelCatalog } from "../models";
 import type { ModelExecutionSession } from "../models/execution/session";
 import type { ObjectQuery, ObjectQueryExplanation, ObjectQueryPredicateComparison, ObjectQueryPredicateContains, ObjectQueryPredicateExists, ObjectQueryPredicateGroup, ObjectQueryPredicateIn, ObjectQueryPredicateNot, ObjectQuerySortDirection, ValidatedObjectQuery } from "../objects/query";
 import type { ObjectVectorHandle, VectorProfileName } from "../objects/vectors/types";
-import type { ObjectLinkTargetType, ObjectRef, ObjectType, Property, ValueType } from "../ontology";
-import type { InferObjectProperties, InferPropertyUnit, InferPropertyValue, InferTelemetryBatchProperties, InferTelemetryPropertyIds } from "../ontology/inference";
+import type { ObjectLinkTargetType, ObjectRef, Property } from "../ontology";
+import type { InferPropertyUnit, InferPropertyValue, InferTelemetryBatchProperties, InferTelemetryPropertyIds } from "../ontology/inference";
+import type { RegisteredObjectType } from "../ontology/registered";
 import type { OntologyDocumentInput, OntologyRegistry, OntologySource } from "../ontology/registry";
-import type { LinkToken, ObjectTypeWithPropertyTokens, PropertyToken } from "../ontology/tokens";
+import type { LinkToken, ObjectTypeProperties, ObjectTypeWithPropertyTokens, PropertyToken } from "../ontology/tokens";
 import type { Queues } from "../queues";
 import type { ActionRunRecord, ObjectLinkRow, Storage } from "../storage";
 /**
@@ -63,28 +64,30 @@ export type BatchItemResult<T> = {
     readonly error: Error;
 };
 export type { OntologyDocumentInput, OntologySource };
-type ObjectTypeFromSource<TSource> = TSource extends {
-    objectTypes: infer TObjectTypes extends readonly ObjectTypeWithPropertyTokens[];
-} ? TObjectTypes[number] : TSource extends ObjectTypeWithPropertyTokens ? TSource : never;
-type ValueTypeFromSource<TSource> = TSource extends {
-    valueTypes: infer TValueTypes extends readonly ValueType[];
-} ? TValueTypes[number] : never;
-export type RegisteredObjectType<TOntologySources extends readonly OntologySource[]> = ObjectTypeFromSource<TOntologySources[number]>;
-export type RegisteredValueTypes<TOntologySources extends readonly OntologySource[]> = readonly ValueTypeFromSource<TOntologySources[number]>[];
-export type TwinObject<TObjectType extends ObjectType, TValueTypes extends readonly ValueType[]> = {
+/** One stored object. Covariant: a row of an object type is a row of the loose base type. */
+export type TwinObject<out TObjectType extends ObjectTypeWithPropertyTokens> = {
     primaryId: string;
     objectTypeId: TObjectType["id"];
-    properties: InferObjectProperties<TObjectType, TValueTypes>;
+    properties: ObjectTypeProperties<TObjectType>;
     createdAt: Date;
     updatedAt: Date;
 };
-type MaterializedObjectRow<TObjectType extends Pick<ObjectType, "id" | "properties">, TValueTypes extends readonly ValueType[]> = {
-    primaryId: string;
-    objectTypeId: TObjectType["id"];
-    properties: InferObjectProperties<TObjectType, TValueTypes>;
-    createdAt: Date;
-    updatedAt: Date;
+/** A row returned by an object query, before any `.expand(...)`. */
+export type ObjectQueryRow<TObjectType extends ObjectTypeWithPropertyTokens> = TwinObject<TObjectType> & {
+    /** Relevance, present when the query ranks its results (`search`, `vector`). */
+    score?: number;
+};
+/**
+ * An object attached under a row's `.links` by `.expand(...)`, before any nested expansion. The
+ * executor attaches `linkProperties` only when the relationship carries metadata.
+ */
+export type ObjectExpansionRow<TObjectType extends ObjectTypeWithPropertyTokens> = TwinObject<TObjectType> & {
+    linkProperties?: Record<string, unknown>;
 };
+/**
+ * Flattens a row built from intersections, so editors show its fields instead of the aliases it was
+ * built from. The `& {}` is what makes TypeScript print the fields.
+ */
 type Simplify<T> = {
     [K in keyof T]: T[K];
 } & {};
@@ -105,49 +108,49 @@ type LinkTokenForObjectType<TObjectType extends ObjectTypeWithPropertyTokens> =
 type PropertyById<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = Extract<TObjectType["properties"][number], {
     id: TPropertyId;
 }>;
-type PropertyWhereValue<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = InferPropertyValue<PropertyById<TObjectType, TPropertyId>, TValueTypes>;
-type PropertyWhereContainsValue<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = NonNullable<PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>> extends string ? string : NonNullable<PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>> extends readonly (infer TItem)[] ? TItem : NonNullable<PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>> extends Record<string, unknown> ? string : never;
-type PropertyWhereComparisonClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = Omit<ObjectQueryPredicateComparison, "propertyId" | "value"> & {
+type PropertyWhereValue<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = InferPropertyValue<PropertyById<TObjectType, TPropertyId>>;
+type PropertyWhereContainsValue<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = NonNullable<PropertyWhereValue<TObjectType, TPropertyId>> extends string ? string : NonNullable<PropertyWhereValue<TObjectType, TPropertyId>> extends readonly (infer TItem)[] ? TItem : NonNullable<PropertyWhereValue<TObjectType, TPropertyId>> extends Record<string, unknown> ? string : never;
+type PropertyWhereComparisonClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = Omit<ObjectQueryPredicateComparison, "propertyId" | "value"> & {
     propertyId: TPropertyId;
-    value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>;
+    value: PropertyWhereValue<TObjectType, TPropertyId>;
 };
-type PropertyWhereInClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = Omit<ObjectQueryPredicateIn, "propertyId" | "values"> & {
+type PropertyWhereInClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = Omit<ObjectQueryPredicateIn, "propertyId" | "values"> & {
     propertyId: TPropertyId;
-    values: readonly PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>[];
+    values: readonly PropertyWhereValue<TObjectType, TPropertyId>[];
 };
 type PropertyWhereExistsClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = Omit<ObjectQueryPredicateExists, "propertyId"> & {
     propertyId: TPropertyId;
 };
-type PropertyWhereContainsClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = Omit<ObjectQueryPredicateContains, "propertyId" | "value"> & {
+type PropertyWhereContainsClause<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = Omit<ObjectQueryPredicateContains, "propertyId" | "value"> & {
     propertyId: TPropertyId;
-    value: PropertyWhereContainsValue<TObjectType, TPropertyId, TValueTypes>;
+    value: PropertyWhereContainsValue<TObjectType, TPropertyId>;
 };
 /** Predicate operators exposed on `where` builder properties. */
-type PropertyPredicate<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"], TValueTypes extends readonly ValueType[]> = {
-    eq(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+type PropertyPredicate<TObjectType extends ObjectTypeWithPropertyTokens, TPropertyId extends TObjectType["properties"][number]["id"]> = {
+    eq(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "eq";
     };
-    neq(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+    neq(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "neq";
     };
-    lt(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+    lt(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "lt";
     };
-    lte(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+    lte(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "lte";
     };
-    gt(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+    gt(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "gt";
     };
-    gte(value: PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> & {
+    gte(value: PropertyWhereValue<TObjectType, TPropertyId>): PropertyWhereComparisonClause<TObjectType, TPropertyId> & {
         op: "gte";
     };
-    in(values: readonly PropertyWhereValue<TObjectType, TPropertyId, TValueTypes>[]): PropertyWhereInClause<TObjectType, TPropertyId, TValueTypes>;
+    in(values: readonly PropertyWhereValue<TObjectType, TPropertyId>[]): PropertyWhereInClause<TObjectType, TPropertyId>;
     exists(value?: boolean): PropertyWhereExistsClause<TObjectType, TPropertyId>;
-    contains(value: PropertyWhereContainsValue<TObjectType, TPropertyId, TValueTypes>): PropertyWhereContainsClause<TObjectType, TPropertyId, TValueTypes>;
+    contains(value: PropertyWhereContainsValue<TObjectType, TPropertyId>): PropertyWhereContainsClause<TObjectType, TPropertyId>;
 };
-type PropertyWhereClause<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[]> = HasKnownPropertyIds<TObjectType> extends false ? ObjectQueryPredicateComparison | ObjectQueryPredicateIn | ObjectQueryPredicateExists | ObjectQueryPredicateContains : {
-    [TPropertyId in TObjectType["properties"][number]["id"]]: PropertyWhereComparisonClause<TObjectType, TPropertyId, TValueTypes> | PropertyWhereInClause<TObjectType, TPropertyId, TValueTypes> | PropertyWhereExistsClause<TObjectType, TPropertyId> | PropertyWhereContainsClause<TObjectType, TPropertyId, TValueTypes>;
+type PropertyWhereClause<TObjectType extends ObjectTypeWithPropertyTokens> = HasKnownPropertyIds<TObjectType> extends false ? ObjectQueryPredicateComparison | ObjectQueryPredicateIn | ObjectQueryPredicateExists | ObjectQueryPredicateContains : {
+    [TPropertyId in TObjectType["properties"][number]["id"]]: PropertyWhereComparisonClause<TObjectType, TPropertyId> | PropertyWhereInClause<TObjectType, TPropertyId> | PropertyWhereExistsClause<TObjectType, TPropertyId> | PropertyWhereContainsClause<TObjectType, TPropertyId>;
 }[TObjectType["properties"][number]["id"]];
 /**
  * Predicate operators for an object type whose properties are not statically
@@ -182,23 +185,23 @@ type UntypedPropertyPredicate = {
 /** True when the object type's property ids are statically known literals. */
 type HasKnownPropertyIds<TObjectType extends ObjectTypeWithPropertyTokens> = string extends TObjectType["properties"][number]["id"] ? false : true;
 /** Typed ObjectSet where predicate. Serialized shape matches object query IR predicates. */
-export type ObjectWhereClause<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[]> = PropertyWhereClause<TObjectType, TValueTypes> | (Omit<ObjectQueryPredicateGroup, "items"> & {
-    items: readonly ObjectWhereClause<TObjectType, TValueTypes>[];
+export type ObjectWhereClause<TObjectType extends ObjectTypeWithPropertyTokens> = PropertyWhereClause<TObjectType> | (Omit<ObjectQueryPredicateGroup, "items"> & {
+    items: readonly ObjectWhereClause<TObjectType>[];
 }) | (Omit<ObjectQueryPredicateNot, "item"> & {
-    item: ObjectWhereClause<TObjectType, TValueTypes>;
+    item: ObjectWhereClause<TObjectType>;
 });
 /**
  * Builder object passed to object query `where` callbacks.
  *
  * Example: `(r) => r.p.externalId.eq("RM-101")`
  */
-export type ObjectWhereBuilder<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[]> = {
+export type ObjectWhereBuilder<TObjectType extends ObjectTypeWithPropertyTokens> = {
     p: HasKnownPropertyIds<TObjectType> extends false ? Record<string, UntypedPropertyPredicate> : {
-        [TPropertyId in TObjectType["properties"][number]["id"]]: PropertyPredicate<TObjectType, TPropertyId, TValueTypes>;
+        [TPropertyId in TObjectType["properties"][number]["id"]]: PropertyPredicate<TObjectType, TPropertyId>;
     };
-    and(...items: readonly ObjectWhereClause<TObjectType, TValueTypes>[]): ObjectWhereClause<TObjectType, TValueTypes>;
-    or(...items: readonly ObjectWhereClause<TObjectType, TValueTypes>[]): ObjectWhereClause<TObjectType, TValueTypes>;
-    not(item: ObjectWhereClause<TObjectType, TValueTypes>): ObjectWhereClause<TObjectType, TValueTypes>;
+    and(...items: readonly ObjectWhereClause<TObjectType>[]): ObjectWhereClause<TObjectType>;
+    or(...items: readonly ObjectWhereClause<TObjectType>[]): ObjectWhereClause<TObjectType>;
+    not(item: ObjectWhereClause<TObjectType>): ObjectWhereClause<TObjectType>;
 };
 export type TelemetryPropertyToken<TObjectType extends ObjectTypeWithPropertyTokens> = TObjectType["p"][InferTelemetryPropertyIds<TObjectType>];
 type AnyPropertyToken = PropertyToken<string, string, Property>;
@@ -209,15 +212,15 @@ export type ObjectSetQueryPropertyToken<TObjectType extends ObjectTypeWithProper
  * - if property has a semantic type, unit is required
  * - otherwise unit is disallowed
  */
-type TelemetryUnitField<TToken extends AnyPropertyToken, TValueTypes extends readonly ValueType[]> = InferPropertyUnit<TToken["property"], TValueTypes> extends never ? {
+type TelemetryUnitField<TToken extends AnyPropertyToken> = InferPropertyUnit<TToken["property"]> extends never ? {
     unit?: never;
 } : {
-    unit: InferPropertyUnit<TToken["property"], TValueTypes>;
+    unit: InferPropertyUnit<TToken["property"]>;
 };
-export type TelemetryAppendInput<TToken extends AnyPropertyToken, TValueTypes extends readonly ValueType[]> = {
-    value: InferPropertyValue<TToken["property"], TValueTypes>;
+export type TelemetryAppendInput<TToken extends AnyPropertyToken> = {
+    value: InferPropertyValue<TToken["property"]>;
     at: Date;
-} & TelemetryUnitField<TToken, TValueTypes>;
+} & TelemetryUnitField<TToken>;
 export interface TelemetryHistoryInput {
     readonly from?: Date;
     readonly to?: Date;
@@ -231,8 +234,8 @@ export interface TelemetryHistoryInput {
  * same series back, typed through the same token, instead of sending the caller under the typed
  * surface to `sixb.storage.timeseries`.
  */
-export type TelemetryChannel<TToken extends AnyPropertyToken, TValueTypes extends readonly ValueType[]> = {
-    append(input: TelemetryAppendInput<TToken, TValueTypes>): Promise<void>;
+export type TelemetryChannel<TToken extends AnyPropertyToken> = {
+    append(input: TelemetryAppendInput<TToken>): Promise<void>;
     /**
      * Points for this series, oldest first unless `order: "desc"`.
      *
@@ -241,15 +244,15 @@ export type TelemetryChannel<TToken extends AnyPropertyToken, TValueTypes extend
      *
      * The point shape is written inline rather than extracted into a named alias. One more level of
      * alias indirection around `InferPropertyValue` in this output position overflows TS's instantiation
-     * depth (TS2589) in consumers as ordinary as `points.map(...)` — the same budget the note on
-     * `TwinObject` describes. `unit` is inferred through the same token as `append` writes it, rather
-     * than widened to `string`: a read that kept `value` precise and gave up on `unit` would be an
-     * arbitrary line, and both are the current ontology's view of a series it validated on write.
+     * depth (TS2589) in consumers as ordinary as `points.map(...)`. `unit` is inferred through the
+     * same token as `append` writes it, rather than widened to `string`: a read that kept `value`
+     * precise and gave up on `unit` would be an arbitrary line, and both are the current ontology's
+     * view of a series it validated on write.
      */
     history(input?: TelemetryHistoryInput): Promise<readonly {
-        readonly value: InferPropertyValue<TToken["property"], TValueTypes>;
+        readonly value: InferPropertyValue<TToken["property"]>;
         readonly at: Date;
-        readonly unit?: InferPropertyUnit<TToken["property"], TValueTypes>;
+        readonly unit?: InferPropertyUnit<TToken["property"]>;
     }[]>;
 };
 type TypedActionReference<TParams extends ActionParamsConfig = ActionParamsConfig> = {
@@ -299,16 +302,32 @@ export type ObjectSetListInput = {
 };
 type LinkTargetObjectTypeIdValue = string | readonly string[];
 type LinkTargetObjectTypeId<TLinkToken> = TLinkToken extends LinkToken<string, string, infer TTargetObjectTypeId> ? TTargetObjectTypeId extends readonly (infer TTargetId extends string)[] ? TTargetId : TTargetObjectTypeId extends string ? TTargetObjectTypeId : never : never;
-type ObjectTypeForId<TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TObjectTypeId extends string> = [Extract<TRegisteredObjectTypes, {
+type ObjectTypeForRegisteredId<TObjectTypeId extends string, TFallback extends ObjectTypeWithPropertyTokens> = [Extract<RegisteredObjectType, {
     id: TObjectTypeId;
-}>] extends [never] ? ObjectTypeWithPropertyTokens : Extract<TRegisteredObjectTypes, {
+}>] extends [never] ? TFallback : Extract<RegisteredObjectType, {
     id: TObjectTypeId;
 }>;
+/**
+ * Resolve an object type named by id, as seen from `TSource`.
+ *
+ * A self-reference (`link.self(...)`, or traversing one backwards) names the source's own id, so it
+ * resolves to the source. Every other id resolves through the generated registry first: a type
+ * reached through a link is then the very type the app imports and passes to `objects(...)`, which
+ * matters because builders are invariant in their object type. `TFallback` applies when the
+ * registry does not know the id — without a manifest, or for a stale one.
+ */
+type ObjectTypeForId<TSource extends ObjectTypeWithPropertyTokens, TObjectTypeId extends string, TFallback extends ObjectTypeWithPropertyTokens = ObjectTypeWithPropertyTokens> = [TObjectTypeId] extends [TSource["id"]] ? [TSource["id"]] extends [TObjectTypeId] ? TSource : ObjectTypeForRegisteredId<TObjectTypeId, TFallback> : ObjectTypeForRegisteredId<TObjectTypeId, TFallback>;
 type DirectObjectTypeForLink<TLinkToken> = TLinkToken extends LinkToken<string, string, LinkTargetObjectTypeIdValue, infer TLink> ? Extract<ObjectLinkTargetType<TLink>, ObjectTypeWithPropertyTokens> : never;
-type ObjectTypeForLinkTarget<TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TLinkToken> = [DirectObjectTypeForLink<TLinkToken>] extends [never] ? ObjectTypeForId<TRegisteredObjectTypes, LinkTargetObjectTypeId<TLinkToken>> : DirectObjectTypeForLink<TLinkToken>;
+/**
+ * The object type a link token points to: the registered type, else the target `link(id, Target)`
+ * captured, else the loose base type.
+ */
+type ObjectTypeForLinkTarget<TSource extends ObjectTypeWithPropertyTokens, TLinkToken> = ObjectTypeForId<TSource, LinkTargetObjectTypeId<TLinkToken>, [
+    DirectObjectTypeForLink<TLinkToken>
+] extends [never] ? ObjectTypeWithPropertyTokens : DirectObjectTypeForLink<TLinkToken>>;
 /**
  * True when the target type is a concrete ontology type rather than the degraded
- * generic base. Direct ObjectType links resolve before this point; unresolved
+ * generic base. Registered and direct targets resolve before this point; unresolved
  * id-only refs fall back to the base type, whose property ids are `string`.
  * Instantiating the typed token map over the broad `Property` union there
  * overflows TypeScript (the same reason `UntypedPropertyPredicate` exists). The
@@ -340,51 +359,11 @@ type LinkTokenCardinality<TLinkToken> = TLinkToken extends LinkToken<string, str
     cardinality: infer TCardinality extends string;
 } ? TCardinality : "many" : "many";
 type LinkTokenId<TLinkToken> = TLinkToken extends LinkToken<string, infer TLinkId, LinkTargetObjectTypeIdValue> ? TLinkId : never;
-type LinkTokenSourceObjectTypeId<TLinkToken> = TLinkToken extends LinkToken<infer TObjectTypeId, string, LinkTargetObjectTypeIdValue> ? TObjectTypeId : string;
-type ObjectLinkCardinality<TLink> = TLink extends {
-    cardinality: infer TCardinality extends string;
-} ? TCardinality : "many";
-type ObjectLinkTarget<TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TLink> = [
-    Extract<ObjectLinkTargetType<TLink>, ObjectTypeWithPropertyTokens>
-] extends [never] ? TLink extends {
-    targetObjectTypeId: infer TTargetObjectTypeId extends LinkTargetObjectTypeIdValue;
-} ? ObjectTypeForId<TRegisteredObjectTypes, ResolveTargetTypeId<TTargetObjectTypeId>> : ObjectTypeWithPropertyTokens : Extract<ObjectLinkTargetType<TLink>, ObjectTypeWithPropertyTokens>;
-type ObjectLinkById<TObjectType extends Pick<ObjectType, "links">, TLinkId extends string> = Extract<TObjectType["links"][number], {
-    id: TLinkId;
-}>;
-type HasKnownObjectLinkIds<TObjectType extends Pick<ObjectType, "links">> = string extends TObjectType["links"][number]["id"] ? false : true;
-/**
- * A branded accumulator entry for one expanded link. Unconstrained on purpose —
- * keeping recursion out of constraints is what avoids TS2589.
- */
-type ExpansionNode<TLinkToken, TRegisteredObjectTypes, TTarget, TCardinality, TChildren> = {
-    readonly __linkToken: TLinkToken;
-    readonly __registeredObjectTypes: TRegisteredObjectTypes;
-    readonly __target: TTarget;
-    readonly __cardinality: TCardinality;
-    readonly __children: TChildren;
-};
-/** The single-key accumulator contribution of one `.expand(link, …)` call. */
-type ExpansionEntry<TLinkToken extends LinkToken<string, string, LinkTargetObjectTypeIdValue>, TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TChild> = {
-    [K in TLinkToken["id"]]: ExpansionNode<TLinkToken, TRegisteredObjectTypes, ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>, LinkTokenCardinality<TLinkToken>, TChild>;
-};
-type ExpansionNodeForSource<TNode, TObjectType extends Pick<ObjectType, "id" | "links">> = TNode extends ExpansionNode<infer TLinkToken, infer TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, infer TTarget, infer TCardinality, infer TChildren> ? LinkTokenId<TLinkToken> extends infer TLinkId extends string ? HasKnownObjectLinkIds<TObjectType> extends true ? [ObjectLinkById<TObjectType, TLinkId>] extends [never] ? never : ExpansionNode<TLinkToken, TRegisteredObjectTypes, ObjectLinkTarget<TRegisteredObjectTypes, ObjectLinkById<TObjectType, TLinkId>>, ObjectLinkCardinality<ObjectLinkById<TObjectType, TLinkId>>, TChildren> : LinkTokenSourceObjectTypeId<TLinkToken> extends TObjectType["id"] ? ExpansionNode<TLinkToken, TRegisteredObjectTypes, TTarget, TCardinality, TChildren> : never : never : never;
-type ExpansionLinksForSource<TLinks, TObjectType extends Pick<ObjectType, "id" | "links">> = {
-    [K in keyof TLinks as [ExpansionNodeForSource<TLinks[K], TObjectType>] extends [never] ? never : K]: ExpansionNodeForSource<TLinks[K], TObjectType>;
-};
-/** Materialize one accumulated expansion entry into its row value. */
-type ExpandedLinkType<TNode, TValueTypes extends readonly ValueType[]> = TNode extends ExpansionNode<unknown, infer TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, infer TTarget, infer TCardinality, infer TChildren> ? TCardinality extends "one" ? ExpandedRowType<TTarget, TChildren, TValueTypes, TRegisteredObjectTypes> | null : ExpandedRowType<TTarget, TChildren, TValueTypes, TRegisteredObjectTypes>[] : never;
-/**
- * An expanded child row: the target object, optional edge `linkProperties` (the
- * executor attaches it only when the relationship carries metadata), and its own
- * nested `links` (present only when the child was itself expanded). The recursion
- * is confined to this lazily-evaluated position.
- */
 /**
  * Loud row substituted for a `.expand()` whose target type is MISSING from an
  * otherwise-present ontology manifest (a stale manifest, or a wrong link target
  * id). Reading a real property is then a compile error pointing at the fix,
- * instead of the old silent `Record<string, unknown>`. The no-manifest loose
+ * instead of a silent `Record<string, unknown>`. The no-manifest loose
  * default stays graceful — this only fires when the registry is concrete yet the
  * target id is absent, i.e. precision was expected but lost.
  */
@@ -396,111 +375,95 @@ type UnresolvedExpansionRow = {
     };
     createdAt: Date;
     updatedAt: Date;
-};
-type ExpandedRowType<TTarget, TChildren, TValueTypes extends readonly ValueType[], TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens> = TTarget extends Pick<ObjectType, "id" | "properties" | "links"> ? string extends TTarget["id"] ? string extends TRegisteredObjectTypes["id"] ? ExpandedRowForSource<TTarget, TValueTypes, ExpansionLinksForSource<TChildren, TTarget>, {
-    linkProperties?: Record<string, unknown>;
-}> : UnresolvedExpansionRow : ExpandedRowForSource<TTarget, TValueTypes, ExpansionLinksForSource<TChildren, TTarget>, {
     linkProperties?: Record<string, unknown>;
-}> : never;
-type ExpandedRowForSource<TObjectType extends Pick<ObjectType, "id" | "properties" | "links">, TValueTypes extends readonly ValueType[], TLinks, TExtra = unknown> = Simplify<MaterializedObjectRow<TObjectType, TValueTypes> & TExtra & ([keyof TLinks] extends [never] ? unknown : {
+};
+/**
+ * The row an expanded target contributes before its own nested expansions. A polymorphic target
+ * (`link(id, [A, B])`) yields a union of rows, discriminated by `objectTypeId`.
+ */
+type ExpandedTargetRow<TTarget extends ObjectTypeWithPropertyTokens> = TTarget extends ObjectTypeWithPropertyTokens ? HasKnownObjectType<TTarget> extends true ? ObjectExpansionRow<TTarget> : string extends RegisteredObjectType["id"] ? ObjectExpansionRow<TTarget> : UnresolvedExpansionRow : never;
+/** The `.links` entry one `.expand(link, …)` adds: `Target | null` for `"one"`, else `Target[]`. */
+type ObjectExpansionLinks<TLinkToken, TChildRow> = {
     links: {
-        [K in keyof TLinks]: ExpandedLinkType<TLinks[K], TValueTypes>;
+        [K in LinkTokenId<TLinkToken>]: LinkTokenCardinality<TLinkToken> extends "one" ? Simplify<TChildRow> | null : Simplify<TChildRow>[];
     };
-})>;
+};
 /**
- * The terminal row of a query: the matched object, plus a typed `links` map once
- * the query accumulated expansions. A query with no `.expand(...)` returns the
- * plain materialized row, so existing `list`/`first` consumers are unchanged.
+ * Add the `.links` entry of one expansion to `TRow`. Distributes over a polymorphic row, so a
+ * nested expansion declared on one member type (`owner.expand(User.l.region)`) only reaches the
+ * rows of that type.
  */
-export type ObjectQueryRow<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[], TLinks> = TObjectType extends ObjectTypeWithPropertyTokens ? ExpandedRowForSource<TObjectType, TValueTypes, ExpansionLinksForSource<TLinks, TObjectType>> & {
-    score?: number;
-} : never;
+type WithExpansion<TRow, TLinkToken extends LinkToken<string, string, LinkTargetObjectTypeIdValue>, TChildRow> = TRow extends {
+    objectTypeId: infer TObjectTypeId;
+} ? TLinkToken["objectTypeId"] extends TObjectTypeId ? TRow & ObjectExpansionLinks<TLinkToken, TChildRow> : TRow : TRow;
 /**
- * Builder passed to the nested `.expand(..., (e) => …)` callback. Exposes only
- * `expand`, resolving the next target type from direct metadata or the id
- * registry so deeper hops stay typed and accumulating `TAccumulated` so the
- * nested `.links` shape is recovered from the callback's return.
+ * The nested-expansion callback for a link token's resolved target type. `TChildRow`
+ * is inferred from the returned builder, recovering the nested `.links` shape.
  *
- * A type alias (not an interface) so relating two instantiations stays
- * structural — the same discipline `TwinObject` follows to avoid TS2589
- * (see the note above `TwinObject`). The only recursion is in the lazily
- * evaluated return/callback positions.
- *
- * When the target type is the degraded base (an unresolved id-only target), the
- * builder collapses to the untyped, non-generic {@link UntypedExpandBuilder}:
- * nested expansion still works, just without target-specific link/property
- * checking, and — crucially — without the self-referential generic instantiation
- * over the broad base type that would otherwise overflow TypeScript.
+ * Kept a plain (non-conditional) function type on purpose: wrapping the callback
+ * in a `TLinkToken extends … ? … : never` conditional blocks inference of
+ * `TChildRow` from the argument, so it would silently fall back to its default.
  */
-export type ObjectExpandBuilder<TObjectType extends ObjectTypeWithPropertyTokens, TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TAccumulated = unknown> = HasKnownObjectType<TObjectType> extends false ? UntypedExpandBuilder : {
-    readonly __links?: TAccumulated;
-    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChild = unknown>(link: TLinkToken, build: ObjectExpandNested<TLinkToken, TRegisteredObjectTypes, TChild>): ObjectExpandBuilder<TObjectType, TRegisteredObjectTypes, TAccumulated & ExpansionEntry<TLinkToken, TRegisteredObjectTypes, TChild>>;
-    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChild = unknown>(link: TLinkToken, options?: ObjectExpandOptions<ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>>, build?: ObjectExpandNested<TLinkToken, TRegisteredObjectTypes, TChild>): ObjectExpandBuilder<TObjectType, TRegisteredObjectTypes, TAccumulated & ExpansionEntry<TLinkToken, TRegisteredObjectTypes, TChild>>;
-};
+type ObjectExpandNested<TSource extends ObjectTypeWithPropertyTokens, TLinkToken extends LinkToken<string, string, LinkTargetObjectTypeIdValue>, TChildRow> = (nested: ObjectExpandBuilder<ObjectTypeForLinkTarget<TSource, TLinkToken>>) => ObjectExpandBuilder<ObjectTypeForLinkTarget<TSource, TLinkToken>, TChildRow>;
 /**
- * Loose expand builder for degraded targets. Non-generic and self-referential,
- * so it never instantiates the typed token machinery over the broad base type.
- * Nested expansions still run; their shape simply degrades to the loose row.
+ * Builder passed to the nested `.expand(..., (e) => …)` callback. Exposes only `expand`; each call
+ * adds a `.links` entry to `TRow`, the row this expanded target contributes to its parent.
  */
-type UntypedExpandBuilder = {
-    expand(link: LinkToken, optionsOrBuild?: ObjectExpandOptions<ObjectTypeWithPropertyTokens> | ((nested: UntypedExpandBuilder) => UntypedExpandBuilder), build?: (nested: UntypedExpandBuilder) => UntypedExpandBuilder): UntypedExpandBuilder;
-};
+export interface ObjectExpandBuilder<in out TObjectType extends ObjectTypeWithPropertyTokens, out TRow = ExpandedTargetRow<TObjectType>> {
+    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChildRow = ExpandedTargetRow<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>>(link: TLinkToken, build: ObjectExpandNested<TObjectType, TLinkToken, TChildRow>): ObjectExpandBuilder<TObjectType, WithExpansion<TRow, TLinkToken, TChildRow>>;
+    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChildRow = ExpandedTargetRow<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>>(link: TLinkToken, options?: ObjectExpandOptions<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>, build?: ObjectExpandNested<TObjectType, TLinkToken, TChildRow>): ObjectExpandBuilder<TObjectType, WithExpansion<TRow, TLinkToken, TChildRow>>;
+}
 /**
- * The nested-expansion callback for a link token's resolved target type. `TChild`
- * is inferred from the returned builder's accumulator, recovering the nested
- * `.links` shape; on the degraded path the builder collapses and `TChild` stays
- * its `unknown` default.
+ * Executable object query rooted at `TObjectType`, returning `TRow` rows.
  *
- * Kept a plain (non-conditional) function type on purpose: wrapping the callback
- * in a `TLinkToken extends … ? … : never` conditional blocks inference of
- * `TChild` from the argument, so it would silently fall back to `unknown`.
+ * Invariant in the object type, whose predicates and tokens it both accepts and produces, and
+ * covariant in the row.
  */
-type ObjectExpandNested<TLinkToken extends LinkToken<string, string, LinkTargetObjectTypeIdValue>, TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TChild> = (nested: ObjectExpandBuilder<ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>, TRegisteredObjectTypes>) => ObjectExpandBuilder<ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>, TRegisteredObjectTypes, TChild>;
-export interface ObjectQueryBuilder<TObjectType extends ObjectTypeWithPropertyTokens, TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[], TLinks = unknown> {
+export interface ObjectQueryBuilder<in out TObjectType extends ObjectTypeWithPropertyTokens, out TRow = ObjectQueryRow<TObjectType>> {
     /** Normalized provider-neutral query IR. */
     readonly ir: ObjectQuery;
     /** Add a typed property predicate at the current object type. */
-    where(where: (builder: ObjectWhereBuilder<TObjectType, TValueTypes>) => ObjectWhereClause<TObjectType, TValueTypes> | readonly ObjectWhereClause<TObjectType, TValueTypes>[]): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    where(where: (builder: ObjectWhereBuilder<TObjectType>) => ObjectWhereClause<TObjectType> | readonly ObjectWhereClause<TObjectType>[]): ObjectQueryBuilder<TObjectType, TRow>;
     /** Search configured text fields at the current object type. */
     search(query: string, options?: {
         fields?: readonly ObjectSetQueryPropertyToken<TObjectType>[];
-    }): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    }): ObjectQueryBuilder<TObjectType, TRow>;
     /** Search a profile; text is embedded server-side with its configured model. */
     vector(profile: VectorProfileName<TObjectType>, vector: string, options: {
         k: number;
-    }): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    }): ObjectQueryBuilder<TObjectType, TRow>;
     /** Follow an outgoing link and make the linked object type the current result type. */
     traverse<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>>(link: TLinkToken, options?: {
         direction?: "outgoing";
-    }): ObjectQueryBuilder<ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>, TRegisteredObjectTypes, TValueTypes>;
+    }): ObjectQueryBuilder<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>;
     /** Follow an incoming link and make the link source object type the current result type. */
     traverse<TLinkToken extends LinkToken<string, string, TObjectType["id"] | readonly string[]>>(link: TLinkToken, options: {
         direction: "incoming";
-    }): ObjectQueryBuilder<ObjectTypeForId<TRegisteredObjectTypes, TLinkToken["objectTypeId"]>, TRegisteredObjectTypes, TValueTypes>;
+    }): ObjectQueryBuilder<ObjectTypeForId<TObjectType, TLinkToken["objectTypeId"]>>;
     /**
      * Attach an outgoing link's target objects to each row under `.links`, without
      * changing the result type — the additive counterpart to `traverse` (which
      * replaces the set). The callback nests deeper hops.
      *
-     * Each call widens `TLinks`, so `list`/`first` rows gain a typed `.links` entry
-     * for this link (cardinality `"one"` → `Target | null`, `"many"` → `Target[]`,
-     * each carrying optional `linkProperties` and its own nested `.links`). Nested
-     * targets stay precise when the link uses direct object targets or when the id
-     * target resolves through the registry, and otherwise degrade to the loose base.
+     * Each call adds a typed `.links` entry to the rows `list`/`first` return
+     * (cardinality `"one"` → `Target | null`, `"many"` → `Target[]`, each carrying
+     * optional `linkProperties` and its own nested `.links`). Targets are precise
+     * when they are registered or linked directly, and otherwise degrade to the
+     * loose base.
      */
-    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChild = unknown>(link: TLinkToken, build: ObjectExpandNested<TLinkToken, TRegisteredObjectTypes, TChild>): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks & ExpansionEntry<TLinkToken, TRegisteredObjectTypes, TChild>>;
-    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChild = unknown>(link: TLinkToken, options?: ObjectExpandOptions<ObjectTypeForLinkTarget<TRegisteredObjectTypes, TLinkToken>>, build?: ObjectExpandNested<TLinkToken, TRegisteredObjectTypes, TChild>): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks & ExpansionEntry<TLinkToken, TRegisteredObjectTypes, TChild>>;
+    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChildRow = ExpandedTargetRow<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>>(link: TLinkToken, build: ObjectExpandNested<TObjectType, TLinkToken, TChildRow>): ObjectQueryBuilder<TObjectType, WithExpansion<TRow, TLinkToken, TChildRow>>;
+    expand<TLinkToken extends LinkToken<TObjectType["id"], string, LinkTargetObjectTypeIdValue>, TChildRow = ExpandedTargetRow<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>>(link: TLinkToken, options?: ObjectExpandOptions<ObjectTypeForLinkTarget<TObjectType, TLinkToken>>, build?: ObjectExpandNested<TObjectType, TLinkToken, TChildRow>): ObjectQueryBuilder<TObjectType, WithExpansion<TRow, TLinkToken, TChildRow>>;
     /** Add property ordering at the current object type. */
-    orderBy(property: ObjectSetQueryPropertyToken<TObjectType>, direction?: ObjectQuerySortDirection): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    orderBy(property: ObjectSetQueryPropertyToken<TObjectType>, direction?: ObjectQuerySortDirection): ObjectQueryBuilder<TObjectType, TRow>;
     /** Add relevance ordering for providers that support ranked search. */
-    orderByRelevance(direction?: ObjectQuerySortDirection): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    orderByRelevance(direction?: ObjectQuerySortDirection): ObjectQueryBuilder<TObjectType, TRow>;
     /** Bound the result count. */
-    limit(limit: number): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    limit(limit: number): ObjectQueryBuilder<TObjectType, TRow>;
     /** Request one page of results. */
     page(input: {
         pageSize: number;
         pageToken?: string;
-    }): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes, TLinks>;
+    }): ObjectQueryBuilder<TObjectType, TRow>;
     /** Validate this query against the registered ontology. */
     validate(): ValidatedObjectQuery;
     /** Return a provider-neutral explanation tree for this query. */
@@ -508,16 +471,16 @@ export interface ObjectQueryBuilder<TObjectType extends ObjectTypeWithPropertyTo
     /** Format `explain()` as a compact diagnostic string. */
     formatExplanation(): string;
     /** Execute this query and return matching objects (rows carry `.links` when expanded). */
-    list(): Promise<ListResult<ObjectQueryRow<TObjectType, TValueTypes, TLinks>>>;
+    list(): Promise<ListResult<Simplify<TRow>>>;
     list(options: {
         includeTotal: false;
         signal?: AbortSignal;
-    }): Promise<ListResultWithoutTotal<ObjectQueryRow<TObjectType, TValueTypes, TLinks>>>;
+    }): Promise<ListResultWithoutTotal<Simplify<TRow>>>;
     list(options: {
         includeTotal?: true;
         signal?: AbortSignal;
-    }): Promise<ListResult<ObjectQueryRow<TObjectType, TValueTypes, TLinks>>>;
-    list(options?: ObjectQueryListOptions): Promise<ListResult<ObjectQueryRow<TObjectType, TValueTypes, TLinks>> | ListResultWithoutTotal<ObjectQueryRow<TObjectType, TValueTypes, TLinks>>>;
+    }): Promise<ListResult<Simplify<TRow>>>;
+    list(options?: ObjectQueryListOptions): Promise<ListResult<Simplify<TRow>> | ListResultWithoutTotal<Simplify<TRow>>>;
     /** Count the matching objects without returning rows. */
     count(): Promise<number>;
     /** Check whether any object matches without returning rows. */
@@ -525,14 +488,40 @@ export interface ObjectQueryBuilder<TObjectType extends ObjectTypeWithPropertyTo
     /** Count matching objects by configured facetable properties. */
     facets(input: readonly ObjectQueryFacetInput<TObjectType>[]): Promise<ObjectQueryFacetResult[]>;
     /** Execute this query with an outer limit of one and return the first object. */
-    first(): Promise<ObjectQueryRow<TObjectType, TValueTypes, TLinks> | null>;
+    first(): Promise<Simplify<TRow> | null>;
 }
-export interface ObjectByIdHandle<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[]> {
-    vector(profile: VectorProfileName<TObjectType>): ObjectVectorHandle;
+/** Reads bound to one object id. */
+export interface ObjectReadByIdHandle<out TObjectType extends ObjectTypeWithPropertyTokens> {
     /** Get the object at this id, or null if it doesn't exist. */
-    get(): Promise<TwinObject<TObjectType, TValueTypes> | null>;
+    get(): Promise<TwinObject<TObjectType> | null>;
     /** List links from this object, optionally filtered by link token. */
     listLinks(link?: LinkTokenForObjectType<TObjectType>): Promise<readonly ObjectLinkRow[]>;
+}
+/**
+ * The reads of an object set, declared once: `sixb.objects(Type)`, a Workflow step's
+ * `sixb.objects(Type)` and an Action's `read.objects(Type)` add only their own writes on top.
+ */
+export interface ObjectReadSet<in out TObjectType extends ObjectTypeWithPropertyTokens> {
+    /** Get an object by id, or null if it doesn't exist. */
+    get(id: string): Promise<TwinObject<TObjectType> | null>;
+    /** Build an executable provider-neutral object query rooted at this object type. */
+    query(): ObjectQueryBuilder<TObjectType>;
+    /** Bind reads to a specific object id. */
+    byId(id: string): ObjectReadByIdHandle<TObjectType>;
+    /** List stored objects of this type with storage-system filtering and pagination. */
+    list(input?: ObjectSetListInput): Promise<ListResult<TwinObject<TObjectType>>>;
+}
+/**
+ * Reads objects without writing them.
+ *
+ * An Action's `read`, a Workflow step's `sixb` and a `Sixb` runtime are all object readers, so a
+ * helper that takes an `ObjectReader` works in each of them.
+ */
+export interface ObjectReader {
+    objects<const TObjectType extends ObjectTypeWithPropertyTokens>(objectType: TObjectType): ObjectReadSet<TObjectType>;
+}
+export interface ObjectByIdHandle<TObjectType extends ObjectTypeWithPropertyTokens> extends ObjectReadByIdHandle<TObjectType> {
+    vector(profile: VectorProfileName<TObjectType>): ObjectVectorHandle;
     /** Create or update a link from the current object to a target object. */
     link<TLinkToken extends LinkTokenForObjectType<TObjectType>>(link: TLinkToken, target: ObjectRef<ResolveTargetTypeId<TLinkToken["targetObjectTypeId"]>>, options?: {
         properties?: Record<string, unknown>;
@@ -582,25 +571,19 @@ export interface ObjectByIdHandle<TObjectType extends ObjectTypeWithPropertyToke
     /** Withdraw a previous `delete()`. A no-op unless a projection still asserts this object. */
     restore(): Promise<void>;
     /** Read and write telemetry for one telemetry-mode property token. */
-    telemetry<TToken extends TelemetryPropertyToken<TObjectType>>(property: TToken): TelemetryChannel<TToken, TValueTypes>;
+    telemetry<TToken extends TelemetryPropertyToken<TObjectType>>(property: TToken): TelemetryChannel<TToken>;
 }
-export interface ObjectSet<TObjectType extends ObjectTypeWithPropertyTokens, TValueTypes extends readonly ValueType[], TRegisteredObjectTypes extends ObjectTypeWithPropertyTokens = TObjectType> {
-    /** Get an object by id, or null if it doesn't exist. */
-    get(id: string): Promise<TwinObject<TObjectType, TValueTypes> | null>;
+export interface ObjectSet<TObjectType extends ObjectTypeWithPropertyTokens> extends ObjectReadSet<TObjectType> {
     /** Upsert object state facts (latest projection). */
     upsert(input: {
-        properties: InferObjectProperties<TObjectType, TValueTypes>;
-    }): Promise<TwinObject<TObjectType, TValueTypes>>;
-    /** Build an executable provider-neutral object query rooted at this object type. */
-    query(): ObjectQueryBuilder<TObjectType, TRegisteredObjectTypes, TValueTypes>;
+        properties: ObjectTypeProperties<TObjectType>;
+    }): Promise<TwinObject<TObjectType>>;
     /** Bind operations to a specific object id. */
-    byId(id: string): ObjectByIdHandle<TObjectType, TValueTypes>;
-    /** List stored objects of this type with storage-system filtering and pagination. */
-    list(input?: ObjectSetListInput): Promise<ListResult<TwinObject<TObjectType, TValueTypes>>>;
+    byId(id: string): ObjectByIdHandle<TObjectType>;
     /** Append telemetry for multiple objects in a single batch. */
     appendTelemetryBatch(items: readonly {
         id: string;
-        properties: InferTelemetryBatchProperties<TObjectType, TValueTypes>;
+        properties: InferTelemetryBatchProperties<TObjectType>;
         at?: Date;
     }[]): Promise<void>;
     /** Request an action on an object of this type by id (dynamic / server contexts). */