@bjornpagen/bumbledb 0.15.0 → 0.17.0

package/src/query/lower.ts

@@ -1,36 +1,3 @@
-/**
- * `query()` and the IR lowering, REFERENCE-IDENTITY edition. A query is
- * built kysely-shaped — variables minted by {@link v} outside the rule and
- * reused by REFERENCE to join:
- *
- *   query(S).rule((r) => {
- *     const acct = v(Account)
- *     const h = v(Holder)
- *     return r
- *       .match(Account, { id: acct.id, holder: acct.holder })
- *       .match(Holder, { id: acct.holder })
- *       .where(r.eq(acct.holder, r.param("root")))
- *       .find({ account: acct.id, holder: acct.holder })
- *   })
- *
- * — and is an INERT value: `Query<Rels, Row, Params>` with `Row` inferred
- * from each rule's `.find` RECORD (its keys ARE the answer columns) and
- * `Params` inferred to be EXACTLY the params the rules use (params are typed
- * BY USE; a param no rule uses never registers). Variable IDENTITY is the
- * object reference: reusing one value across binding positions IS the join,
- * lowering is a pure function of the query value down to the
- * bridge's `QueryIr` (`bumbledb/crates/bumbledb/src/ir.rs`): relations by
- * declaration ordinal, variables by dense per-rule first-occurrence ids
- * (keyed on the object REFERENCE — the discipline is unchanged, only the map
- * key moved from name to reference), params by first-use order. Lowering is
- * STABLE — the same query value lowers to deeply-equal IR every time, and
- * two identically-written queries (fresh mints each) lower identically.
- * Construction validates negation safety and boundness (typed by the var's
- * label — object identity is invisible to the type tier, so these are
- * construction-time walls); everything else (types, aggregate
- * rosters, rule caps) is the ENGINE's judge, surfacing at prepare.
- */
-
 import * as errors from "@superbuilders/errors"
 import { sealedFieldsOf } from "#closed.ts"
 import type { AnyField, ClosedRoster } from "#fields.ts"
@@ -80,97 +47,60 @@ import { allen, and, eq, ge, gt, le, lt, ne, not, or, pointIn } from "#query/ato
 import type { CheckFind, CheckRecFind, FindShape, HeadRecordOf, RowOfFind } from "#query/find.ts"
 import { count, max, min, pack, sum } from "#query/find.ts"
 import { parseQueryIr } from "#query/parse-ir.ts"
-import type { AnyVar, ClassedField, Flatten, InferredOf, ParamEntry, ParamsRecord, ShapeOf } from "#query/scope.ts"
-import {
-	fieldJoins,
-	inferred,
-	isTerm,
-	makeDuration,
-	makeParam,
-	makeSetParam,
-	renderFieldKind,
-	term
+import type {
+	AnyVar,
+	ClassedField,
+	ExactVars,
+	Flatten,
+	InferredOf,
+	ParamEntry,
+	ParamsRecord,
+	ShapeOf,
+	VarsOf
 } from "#query/scope.ts"
+import { fieldJoins, inferred, isTerm, makeParam, makeSetParam, renderFieldKind, term } from "#query/scope.ts"
 import type { AnySchema, Schema, SchemaRelations } from "#schema.ts"
 
-/**
- * The matchable members of a schema's record — ordinary relations AND
- * closed vocabularies (ψ query atoms; the ENGINE decides folding vs virtual
- * image, the SDK lowers pass-through).
- */
 type QueryRelation<Rels extends SchemaRelations> = Extract<Rels[keyof Rels], MatchOwner>
 
-/** Reads an inferred-params carrier off a rec reference or rule value. */
 type ParamsOf<T> = InferredOf<T> extends { readonly params: infer P extends ParamsRecord } ? P : Record<never, never>
 
-/** Reads an inferred-row carrier off a rule value or query. */
 type RowOf<T> = InferredOf<T> extends { readonly row: infer R } ? R : never
 
-/**
- * A derived table's HEAD signature as classed slots, keyed by column
- * name; `undefined` on values that carry no head.
- */
 type HeadShape = Readonly<Record<string, ClassedField>> | undefined
 
-/**
- * One finished rule as a plain value: the runtime data plus the inferred
- * row/params carrier (and, for an interior or rec rule, the head
- * record of classed slots an `.interior(name)` join pairs against).
- * `.rule(...)` consumes it.
- */
 interface RuleValue<Row, P extends ParamsRecord, Head extends HeadShape = undefined> {
 	readonly rule: RuleData
 	readonly [inferred]?: { readonly row: Row; readonly params: P; readonly head: Head }
 }
 
-/** Any finished rule value. */
 type AnyRuleValue = RuleValue<unknown, ParamsRecord, HeadShape>
 
-/** Reads an inferred-head carrier off a rule value or rec reference. */
 type HeadOf<T> =
 	InferredOf<T> extends { readonly head: infer H extends Readonly<Record<string, ClassedField>> } ? H : undefined
 
-/** One `.interior(name)` position's judgment: a variable. */
 type InteriorBindingOk<V> = V extends AnyVar ? true : false
 
-/**
- * The validated `.interior(name)` bindings record: every entry must be a
- * variable. Arity and class against the named table's head are
- * construction-time (the name is a string, so the head is not a type-level
- * fact).
- */
 type CheckInteriorBindings<B> = {
 	readonly [K in keyof B]: InteriorBindingOk<B[K]> extends true ? B[K] : never
 }
 
-/** One interior-rule builder function. */
 type InteriorBuild<Rels extends SchemaRelations, Classes extends SchemaClasses = SchemaClasses> = (
 	r: InteriorRuleScope<Rels, Classes>
 ) => AnyRuleValue
 
-/** One rec-arm builder function. */
 type RecBuild<Rels extends SchemaRelations, Classes extends SchemaClasses = SchemaClasses> = (
 	r: RecRuleScope<Rels, Classes>
 ) => AnyRuleValue
 
-/** A build function's rule value. */
 type BuiltRule<F> = F extends (r: never) => infer RV ? RV : never
 
-/** The intersected params record of a tuple of rule builds. */
 type BuildsParams<Builds extends readonly ((r: never) => AnyRuleValue)[]> = ShapeOf<ParamsOf<BuiltRule<Builds[number]>>>
 
-/**
- * The term/predicate/aggregate constructor vocabulary every rule builder
- * carries — pure value builders. Variables are minted by the free {@link v},
- * outside the rule, and reused by reference; `r` no longer mints them.
- */
 interface TermOps {
-	/** Names one scalar parameter: typed by its use; the key of the execute params object. */
 	readonly param: typeof makeParam
-	/** Names one ∈-set parameter (the IR's `ParamSet`): bound to a readonly array at execution. */
+
 	readonly inSet: typeof makeSetParam
-	/** The measure of an interval-typed variable: `|[s, e)| = e − s`, u64. */
-	readonly duration: typeof makeDuration
 	readonly eq: typeof eq
 	readonly ne: typeof ne
 	readonly lt: typeof lt
@@ -189,52 +119,85 @@ interface TermOps {
 	readonly pack: typeof pack
 }
 
-/** The rule builder a `query(S).rule(...)` callback receives (`Classes` — the join judge's authority). */
 interface QueryRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses = SchemaClasses> extends TermOps {
-	/** The first EDB atom of the rule: fields bind variables, params, ∈-sets, or bare literals; absence is the wildcard. */
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, stated as a signature so it holds for GENERIC R too
+	 * (VarsOf unifies with itself by identity; the general form's deferred
+	 * conditionals cannot). The mint invariant — a variable's mint slot IS its
+	 * position slot, same owner, same column — discharges the join judgment by
+	 * construction (proposals/one-representation/50-generic-binding.md, "The
+	 * ruling"); an all-var record contributes no params, so the chain starts
+	 * paramless. {@link ExactVars} maps a foreign key to `never`, so an
+	 * aliased extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): QueryRuleChain<Rels, Record<never, never>, Classes>
+
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
 	): QueryRuleChain<Rels, BindParamsShape<MatchFields<R>, B>, Classes>
-	/**
-	 * A rule may START with a finished table: an interior atom is a positive
-	 * occurrence exactly as the engine represents it, so its variables ground
-	 * — the identity projection `(c) | reach(c);` is spellable with no
-	 * re-grounding join over a domain relation.
-	 */
+
 	interior<const B extends Readonly<Record<string, AnyVar>>>(
 		name: string,
 		bindings: B & CheckInteriorBindings<B>
 	): QueryRuleChain<Rels, Record<never, never>, Classes>
 }
 
-/** The chain of a plain query rule: more atoms, residual predicates, then the head. */
 interface QueryRuleChain<
 	Rels extends SchemaRelations,
 	P extends ParamsRecord,
 	Classes extends SchemaClasses = SchemaClasses
 > {
-	/** One more positive EDB atom — variable reuse joins, class-equal by the mint-slot judgment. */
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, generic R included. The mint invariant (a variable's mint
+	 * slot IS its position slot) discharges the join judgment by construction
+	 * (proposals/one-representation/50-generic-binding.md, "The ruling"); an
+	 * all-var record contributes no params — P rides through unchanged.
+	 * {@link ExactVars} maps a foreign key to `never`, so an aliased
+	 * extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): QueryRuleChain<Rels, P, Classes>
+
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
 	): QueryRuleChain<Rels, Flatten<P & BindParamsShape<MatchFields<R>, B>>, Classes>
-	/** One residual predicate: a comparison, an `and`/`or` tree, or a negated atom (`r.not`). */
+
 	where<const C extends AnyCond>(
 		cond: CheckCond<Classes, C> & C
 	): QueryRuleChain<Rels, Flatten<P & CondParamsShape<C>>, Classes>
-	/** One interior atom over a finished table (an earlier interior, or the rec). */
+
 	interior<const B extends Readonly<Record<string, AnyVar>>>(
 		name: string,
 		bindings: B & CheckInteriorBindings<B>
 	): QueryRuleChain<Rels, P, Classes>
-	/** The head projection: a `find` RECORD whose keys name the answer columns. */
+
 	find<const F extends FindShape>(entries: F & CheckFind<F>): RuleValue<RowOfFind<F>, P>
 }
 
-/** The rule builder an `interior("mid", ...)` callback receives. */
 interface InteriorRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses = SchemaClasses>
 	extends TermOps {
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, generic R included. The mint invariant (a variable's mint
+	 * slot IS its position slot) discharges the join judgment by construction
+	 * (proposals/one-representation/50-generic-binding.md, "The ruling"); an
+	 * all-var record contributes no params, so the chain starts paramless.
+	 * {@link ExactVars} maps a foreign key to `never`, so an aliased
+	 * extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): InteriorRuleChain<Rels, Record<never, never>, Classes>
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
@@ -245,12 +208,24 @@ interface InteriorRuleScope<Rels extends SchemaRelations, Classes extends Schema
 	): InteriorRuleChain<Rels, Record<never, never>, Classes>
 }
 
-/** The chain of an interior rule: bound-variable heads only. */
 interface InteriorRuleChain<
 	Rels extends SchemaRelations,
 	P extends ParamsRecord,
 	Classes extends SchemaClasses = SchemaClasses
 > {
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, generic R included. The mint invariant (a variable's mint
+	 * slot IS its position slot) discharges the join judgment by construction
+	 * (proposals/one-representation/50-generic-binding.md, "The ruling"); an
+	 * all-var record contributes no params — P rides through unchanged.
+	 * {@link ExactVars} maps a foreign key to `never`, so an aliased
+	 * extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): InteriorRuleChain<Rels, P, Classes>
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
@@ -265,8 +240,20 @@ interface InteriorRuleChain<
 	find<const F extends FindShape>(entries: F & CheckRecFind<F>): RuleValue<RowOfFind<F>, P, HeadRecordOf<Classes, F>>
 }
 
-/** The rule builder a `.reach("reach", { base, rec })` arm receives. */
 interface RecRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses = SchemaClasses> extends TermOps {
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, generic R included. The mint invariant (a variable's mint
+	 * slot IS its position slot) discharges the join judgment by construction
+	 * (proposals/one-representation/50-generic-binding.md, "The ruling"); an
+	 * all-var record contributes no params, so the chain starts paramless.
+	 * {@link ExactVars} maps a foreign key to `never`, so an aliased
+	 * extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): RecRuleChain<Rels, Record<never, never>, Classes>
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
@@ -277,17 +264,24 @@ interface RecRuleScope<Rels extends SchemaRelations, Classes extends SchemaClass
 	): RecRuleChain<Rels, Record<never, never>, Classes>
 }
 
-/**
- * The chain of a rec arm. `.interior("reach", …)` is the self-atom
- * on rec arms (and a prior interior on either list). `find` takes bound
- * variables only — aggregates and the measure are unrepresentable in a
- * rec head.
- */
 interface RecRuleChain<
 	Rels extends SchemaRelations,
 	P extends ParamsRecord,
 	Classes extends SchemaClasses = SchemaClasses
 > {
+	/**
+	 * The FULL binding: every column of R bound to its own v(R) mint — the
+	 * identity atom, generic R included. The mint invariant (a variable's mint
+	 * slot IS its position slot) discharges the join judgment by construction
+	 * (proposals/one-representation/50-generic-binding.md, "The ruling"); an
+	 * all-var record contributes no params — P rides through unchanged.
+	 * {@link ExactVars} maps a foreign key to `never`, so an aliased
+	 * extra-key record falls to the general form's judgment.
+	 */
+	match<R extends QueryRelation<Rels>, B extends VarsOf<R>>(
+		relation: R,
+		bindings: B & ExactVars<R, B>
+	): RecRuleChain<Rels, P, Classes>
 	match<R extends QueryRelation<Rels>, const B extends MatchShape<MatchFields<R>>>(
 		relation: R,
 		bindings: B & CheckBindings<Classes, MatchFields<R>, ClassRecordOf<Classes, R["name"]>, B>
@@ -302,38 +296,32 @@ interface RecRuleChain<
 	find<const F extends FindShape>(entries: F & CheckRecFind<F>): RuleValue<RowOfFind<F>, P, HeadRecordOf<Classes, F>>
 }
 
-/** A query's runtime description — everything lowering, the wire marshal, and answer decode read. */
 type QueryData =
 	| {
 			readonly kind: "cq"
-			/** Named interiors in declaration order (DAG). */
+
 			readonly interiors: readonly InteriorData[]
-			/** The main rules in written order (multiple rules = set union). */
+
 			readonly rules: readonly RuleData[]
-			/** The head columns (every rule derives the same head; written order = answer column order). */
+
 			readonly finds: readonly FindColumn[]
-			/** The registered params in first-use order across the query walk (= dense `ParamId`s). */
+
 			readonly params: readonly ParamEntry[]
 	  }
 	| {
 			readonly kind: "reach"
-			/** Named interiors in declaration order (DAG). */
+
 			readonly interiors: readonly InteriorData[]
-			/** The linear rec (base and rec arms nonempty by type). */
+
 			readonly rec: RecData
-			/** The main rules in written order (multiple rules = set union). */
+
 			readonly rules: readonly RuleData[]
-			/** The head columns (every rule derives the same head; written order = answer column order). */
+
 			readonly finds: readonly FindColumn[]
-			/** The registered params in first-use order across the query walk (= dense `ParamId`s). */
+
 			readonly params: readonly ParamEntry[]
 	  }
 
-/**
- * An inert query value. `Row` is the inferred answer-row object type;
- * `Params` the inferred execute-params object type — exactly the params the
- * rules use. Prepare with `db.prepare(q)`.
- */
 interface Query<
 	Rels extends SchemaRelations,
 	Row,
@@ -342,34 +330,26 @@ interface Query<
 > {
 	readonly schema: Schema<Rels, Classes>
 	readonly data: QueryData
-	/** One more rule — the query's answers are the SET UNION of its rules' answers; every rule derives the same head. */
+
 	rule<RV extends AnyRuleValue>(
 		build: (r: QueryRuleScope<Rels, Classes>) => RV
 	): Query<Rels, Row | RowOf<RV>, Flatten<Params & ParamsOf<RV>>, Classes>
-	/** Construction error: interiors precede main rules. Uncallable after `.rule()`. */
+
 	interior(name: string, ...builds: never[]): never
-	/** Construction error: reach precedes main rules. Uncallable after `.rule()`. */
+
 	reach(name: string, arms: never): never
 	readonly [inferred]?: { readonly row: Row; readonly params: Params }
 }
 
-/** Any query value as lowering and the runtime consume it. */
 interface AnyQuery {
 	readonly schema: AnySchema
 	readonly data: QueryData
 }
 
-/** Extracts a query value's inferred answer-row type. */
 type QueryRow<Q extends AnyQuery> = RowOf<Q>
 
-/** Extracts a query value's inferred execute-params type. */
 type QueryParams<Q extends AnyQuery> = ParamsOf<Q>
 
-/**
- * The entry value of `query(S)`: interiors, then reach (moves to
- * {@link QueryReachStart}), then the first `.rule` mints the query.
- * `interior` / `reach` exist only on this CQ start.
- */
 type QueryStart<
 	Rels extends SchemaRelations,
 	Classes extends SchemaClasses = SchemaClasses,
@@ -388,7 +368,6 @@ type QueryStart<
 	): QueryReachStart<Rels, Classes, Flatten<P & BuildsParams<Base> & BuildsParams<Step>>>
 }
 
-/** After `.reach()`: interior/reach are unrepresentable; only `.rule` remains. */
 type QueryReachStart<
 	Rels extends SchemaRelations,
 	Classes extends SchemaClasses = SchemaClasses,
@@ -399,11 +378,9 @@ type QueryReachStart<
 	): Query<Rels, RowOf<RV>, Flatten<P & ParamsOf<RV>>, Classes>
 }
 
-/** The frozen constructor vocabulary every rule builder spreads. */
 const termOps: TermOps = Object.freeze({
 	param: makeParam,
 	inSet: makeSetParam,
-	duration: makeDuration,
 	eq,
 	ne,
 	lt,
@@ -422,21 +399,18 @@ const termOps: TermOps = Object.freeze({
 	pack
 })
 
-/** One rule under construction: immutable — every chain step is a fresh state. Boundness rides the `bound` set of var references. */
 interface RuleBuildState {
 	readonly items: readonly RuleItem[]
 	readonly bound: ReadonlySet<AnyVar>
 	readonly paramUses: readonly ParamUse[]
 }
 
-/** The empty rule state. */
 const EMPTY_RULE: RuleBuildState = Object.freeze({
 	items: Object.freeze([]),
 	bound: new Set<AnyVar>(),
 	paramUses: Object.freeze([])
 })
 
-/** One resolved bindings record: the atom entries, the variable references it binds, and the params it uses. */
 interface ResolvedBindings {
 	readonly atom: AtomData
 	readonly vars: readonly AnyVar[]
@@ -461,11 +435,6 @@ function mintSlotOf(context: ChainContext, ref: AnyVar): ClassedField {
 	return { field: ref.field, class: context.classes[ref.owner.name]?.[ref.column] }
 }
 
-/**
- * Judges one membership ARRAY at a binding position — legal exactly at a
- * CLOSED-reference field, holding ≥ 2 DISTINCT handle names. The returned
- * name is CONTENT-ADDRESSED (vocabulary + the member SET).
- */
 function membershipSet(
 	context: string,
 	field: AnyField,
@@ -502,14 +471,6 @@ function membershipSet(
 	return { name: `∈ ${roster.name} ${JSON.stringify(key)}`, members: Object.freeze(members) }
 }
 
-/**
- * Resolves a bindings record against an atom owner's matchable fields, in
- * the record's written order: terms classify by their runtime tag,
- * everything else is a bare literal. Every VARIABLE binding judges
- * `fieldJoins(mintSlot, positionSlot)` and throws on a class-unequal reuse
- * (the runtime twin of `CheckBindings`); the bound refs are collected for
- * the rule's boundness set.
- */
 function resolveBindings(
 	context: ChainContext,
 	label: string,
@@ -574,10 +535,6 @@ function resolveBindings(
 					)
 					break
 				}
-				case "duration":
-					throw errors.new(
-						`${label}.${fieldName}: the measure is not a field-typed value — it lives in comparisons and find entries`
-					)
 			}
 		} else if (Array.isArray(value)) {
 			const set = membershipSet(`${label}.${fieldName}`, declared.field, value)
@@ -599,7 +556,6 @@ function resolveBindings(
 	return { atom: Object.freeze({ relation, bindings: Object.freeze(entries) }), vars, uses }
 }
 
-/** Extends a rule state with one positive atom; the bound variable references accumulate into the boundness set. */
 function advanceMatch(
 	context: ChainContext,
 	state: RuleBuildState,
@@ -618,7 +574,6 @@ function advanceMatch(
 	})
 }
 
-/** Resolves one comparison side to its runtime term (variables and the measure ride by reference). */
 function cmpTermDataOf(value: unknown): CmpTermData {
 	if (isTerm(value)) {
 		switch (value[term]) {
@@ -628,30 +583,16 @@ function cmpTermDataOf(value: unknown): CmpTermData {
 				return Object.freeze({ kind: "param" as const, name: value.name })
 			case "setParam":
 				return Object.freeze({ kind: "setParam" as const, name: value.name })
-			case "duration":
-				return Object.freeze({ kind: "measure" as const, ref: value.over })
 		}
 	}
 	return Object.freeze({ kind: "literal" as const, value })
 }
 
-/**
- * One comparison side's contribution to the param census: a param/set side
- * anchors to its SIBLING — a variable's field descriptor or the measure; an
- * unanchorable use records with no anchor.
- */
 function sideUses(op: CmpKind, side: CmpTermData, sibling: CmpTermData, uses: ParamUse[]): void {
 	if (side.kind !== "param" && side.kind !== "setParam") {
 		return
 	}
-	let anchor: AnyField | "measure" | undefined
-	if (sibling.kind === "var") {
-		anchor = sibling.ref.field
-	} else if (sibling.kind === "measure") {
-		anchor = "measure"
-	} else {
-		anchor = undefined
-	}
+	const anchor = sibling.kind === "var" ? sibling.ref.field : undefined
 	uses.push(
 		Object.freeze({
 			name: side.name,
@@ -663,7 +604,6 @@ function sideUses(op: CmpKind, side: CmpTermData, sibling: CmpTermData, uses: Pa
 	)
 }
 
-/** Lowers one condition VALUE to its runtime data, recording param uses. */
 function condDataOf(cond: AnyCond, uses: ParamUse[]): CondData {
 	if (cond.cond === "cmp") {
 		const lhs = cmpTermDataOf(cond.lhs)
@@ -695,7 +635,6 @@ function condDataOf(cond: AnyCond, uses: ParamUse[]): CondData {
 	)
 }
 
-/** Extends a rule state with one `.where` item (a condition or a negated atom). */
 function advanceWhere(context: ChainContext, state: RuleBuildState, cond: AnyCond): RuleBuildState {
 	if (typeof cond !== "object" || cond === null || !("cond" in cond)) {
 		throw errors.new("where() takes a comparison, an and()/or() tree, or a negated atom")
@@ -731,15 +670,6 @@ function advanceWhere(context: ChainContext, state: RuleBuildState, cond: AnyCon
 	})
 }
 
-/**
- * Extends a rule state with one interior atom (a named record over head keys;
- * vars validated at completion). A POSITIVE interior atom is a positive
- * occurrence exactly as the engine represents it (`check_atoms` walks Interior
- * and Edb in one loop), so its variables GROUND: they enter the rule's
- * boundness set, may ride the head, and satisfy negation safety — the
- * interior-only identity projection of a finished table is spellable with no
- * re-grounding join. A NEGATED one binds nothing, only rejects.
- */
 function advanceInterior(
 	state: RuleBuildState,
 	target: DerivedTable,
@@ -771,7 +701,6 @@ function advanceInterior(
 	})
 }
 
-/** Narrows a find entry to an aggregate value. */
 function isAggregateEntry(value: unknown): value is { readonly agg: string; readonly over?: unknown } {
 	return typeof value === "object" && value !== null && "agg" in value
 }
@@ -784,7 +713,6 @@ function asVarTerm(context: string, value: unknown): AnyVar {
 	throw errors.new(`${context}: expected a variable`)
 }
 
-/** Classifies one aggregate find entry into its runtime data (variables ride by reference). */
 function aggDataOf(name: string, entry: { readonly agg: string; readonly over?: unknown }): AggData {
 	if (entry.agg === "count") {
 		return Object.freeze({ op: "count" as const })
@@ -797,10 +725,7 @@ function aggDataOf(name: string, entry: { readonly agg: string; readonly over?:
 			if (isTerm(over) && over[term] === "var") {
 				return Object.freeze({ op: "fold" as const, fold: entry.agg, over })
 			}
-			if (isTerm(over) && over[term] === "duration") {
-				return Object.freeze({ op: "fold" as const, fold: entry.agg, over: Object.freeze({ duration: over.over }) })
-			}
-			throw errors.new(`find ${name} (${entry.agg}): takes a variable or r.duration(v)`)
+			throw errors.new(`find ${name} (${entry.agg}): takes a variable`)
 		}
 		case "pack":
 			return Object.freeze({ op: "pack" as const, over: asVarTerm(`find ${name} (pack)`, over) })
@@ -809,11 +734,6 @@ function aggDataOf(name: string, entry: { readonly agg: string; readonly over?:
 	}
 }
 
-/**
- * Classifies one find entry into its named answer column (the KEY names the
- * column, `count` included). The `slot`/`closed` slices are resolved LATER,
- * at rule completion, where boundness and the mint slots are in hand.
- */
 function findColumnOf(name: string, entry: unknown): FindColumn {
 	if (isTerm(entry)) {
 		if (entry[term] === "var") {
@@ -824,17 +744,7 @@ function findColumnOf(name: string, entry: unknown): FindColumn {
 				slot: undefined
 			})
 		}
-		if (entry[term] === "duration") {
-			return Object.freeze({
-				name,
-				entry: Object.freeze({ kind: "measure" as const, over: entry.over }),
-				closed: undefined,
-				slot: undefined
-			})
-		}
-		throw errors.new(
-			`find ${name}: a ${entry[term]} is not projectable — find takes variables, r.duration(v), or aggregates`
-		)
+		throw errors.new(`find ${name}: a ${entry[term]} is not projectable — find takes variables or aggregates`)
 	}
 	if (isAggregateEntry(entry)) {
 		return Object.freeze({
@@ -844,32 +754,29 @@ function findColumnOf(name: string, entry: unknown): FindColumn {
 			slot: undefined
 		})
 	}
-	throw errors.new(`find ${name}: not a find entry — find takes variables, r.duration(v), or aggregates`)
+	throw errors.new(`find ${name}: not a find entry — find takes variables or aggregates`)
 }
 
 /**
- * The orderable ban's pointed refusal (`docs/architecture/10-data-model.md`
+ * The orderable ban's pointed refusal
  * § orderability): a closed reference is equality-and-membership only.
  */
 function closedOrderError(context: string, position: string, vocabulary: string): Error {
 	return errors.new(
-		`${context}: ${position} is a ${vocabulary} reference — declaration order is an accident, not semantics: vocabularies do not order (docs/architecture/10-data-model.md; equality, membership, and counting remain)`
+		`${context}: ${position} is a ${vocabulary} reference — declaration order is an accident, not semantics: vocabularies do not order (equality, membership, and counting remain)`
 	)
 }
 
-/** The comparison ops under the orderable ban (order roster + point membership). */
 function isOrderOp(op: CmpKind | "binding"): op is "lt" | "le" | "gt" | "ge" | "pointIn" {
 	return op === "lt" || op === "le" || op === "gt" || op === "ge" || op === "pointIn"
 }
 
-/** Requires a variable to be bound by a relation atom of the rule (the boundness wall — invisible to the type tier). */
 function assertBound(where: string, bound: ReadonlySet<AnyVar>, ref: AnyVar): void {
 	if (!bound.has(ref)) {
 		throw errors.new(`${where}: the variable ${ref.label} is not bound by a relation atom of the rule`)
 	}
 }
 
-/** Requires a variable to be interval-typed (the measure's and pack's domain), off its own descriptor. */
 function assertInterval(where: string, ref: AnyVar): void {
 	if (ref.field.kind !== "interval") {
 		throw errors.new(
@@ -878,7 +785,6 @@ function assertInterval(where: string, ref: AnyVar): void {
 	}
 }
 
-/** Requires a variable's own field to be non-closed (the orderable ban's runtime twin). */
 function assertNotClosed(where: string, position: string, ref: AnyVar): void {
 	const roster = rosterOf(ref.field)
 	if (roster !== undefined) {
@@ -886,11 +792,12 @@ function assertNotClosed(where: string, position: string, ref: AnyVar): void {
 	}
 }
 
-/**
- * The classed mint slot one answer column's VALUES flow from: a projected
- * variable's mint slot. Counts, folds, `pack` and the measure derive
- * numbers/intervals, so they resolve no slot.
- */
+function assertNumeric(where: string, position: string, ref: AnyVar): void {
+	if (ref.field.kind !== "u64" && ref.field.kind !== "i64") {
+		throw errors.new(`${where}: ${position} ${ref.label} is ${ref.field.kind}, not numeric — a fold reads u64/i64 only`)
+	}
+}
+
 function findColumnSlotOf(context: ChainContext, column: FindColumn): ClassedField | undefined {
 	const entry = column.entry
 	if (entry.kind === "var") {
@@ -899,7 +806,6 @@ function findColumnSlotOf(context: ChainContext, column: FindColumn): ClassedFie
 	return undefined
 }
 
-/** Validates one find column's variable references (boundness + the orderable/interval walls, off the var's own field). */
 function validateColumn(context: ChainContext, bound: ReadonlySet<AnyVar>, column: FindColumn): void {
 	const where = `${contextLabel(context)} find ${column.name}`
 	const entry = column.entry
@@ -907,23 +813,14 @@ function validateColumn(context: ChainContext, bound: ReadonlySet<AnyVar>, colum
 		assertBound(where, bound, entry.over)
 		return
 	}
-	if (entry.kind === "measure") {
-		assertBound(where, bound, entry.over)
-		assertInterval(where, entry.over)
-		return
-	}
 	const agg = entry.agg
 	switch (agg.op) {
 		case "count":
 			return
 		case "fold": {
-			if ("duration" in agg.over) {
-				assertBound(where, bound, agg.over.duration)
-				assertInterval(where, agg.over.duration)
-				return
-			}
 			assertBound(where, bound, agg.over)
 			assertNotClosed(where, `the ${agg.fold} input`, agg.over)
+			assertNumeric(where, `the ${agg.fold} input`, agg.over)
 			return
 		}
 		case "pack":
@@ -933,11 +830,6 @@ function validateColumn(context: ChainContext, bound: ReadonlySet<AnyVar>, colum
 	}
 }
 
-/**
- * Validates one condition's variable references against the rule's bound
- * set — and, for `eq`/`ne` over two variables, holds the class wall through
- * the mint slots (the unification IS a join; bare pairs only with bare).
- */
 function validateCond(context: ChainContext, bound: ReadonlySet<AnyVar>, cond: CondData): void {
 	const label = contextLabel(context)
 	if (cond.kind === "cmp") {
@@ -949,10 +841,6 @@ function validateCond(context: ChainContext, bound: ReadonlySet<AnyVar>, cond: C
 					throw closedOrderError(label, `the ${cond.op.kind} side ${side.ref.label}`, roster.name)
 				}
 			}
-			if (side.kind === "measure") {
-				assertBound(label, bound, side.ref)
-				assertInterval(label, side.ref)
-			}
 		}
 		if ((cond.op.kind === "eq" || cond.op.kind === "ne") && cond.lhs.kind === "var" && cond.rhs.kind === "var") {
 			assertBound(label, bound, cond.lhs.ref)
@@ -972,16 +860,6 @@ function validateCond(context: ChainContext, bound: ReadonlySet<AnyVar>, cond: C
 	}
 }
 
-/**
- * Validates one interior item: every head column of the table is bound exactly
- * once (a missing or extra key is a pointed error) and each variable joins
- * its head column's classed slot. A POSITIVE interior atom GROUNDS its
- * variables (a positive occurrence, exactly the engine's representation),
- * so no boundness precondition exists; a NEGATED one binds nothing — its
- * variables must be positively bound elsewhere in the rule, the same
- * safety rule as EDB negation. When the table's own first rule is in flight
- * (`finds` empty), the completing rule's OWN find columns ARE the head.
- */
 function validateInterior(
 	context: ChainContext,
 	bound: ReadonlySet<AnyVar>,
@@ -1035,12 +913,6 @@ function validateInterior(
 	}
 }
 
-/**
- * Completes one rule: enriches the find columns (declaration-order-safe
- * keys, boundness validated, each column's classed slot and closed slice
- * resolved), then walks the body walls — negated-atom boundness safety, interior
- * head pairing, and condition validation.
- */
 function completeRule(context: ChainContext, state: RuleBuildState, rawColumns: readonly FindColumn[]): RuleData {
 	const label = contextLabel(context)
 	if (rawColumns.length === 0) {
@@ -1072,15 +944,10 @@ function completeRule(context: ChainContext, state: RuleBuildState, rawColumns:
 	return Object.freeze({ items: state.items, finds: Object.freeze(columns), paramUses: state.paramUses })
 }
 
-/** Builds one typed rule value over completed rule data. */
 function makeRuleValue<Row, P extends ParamsRecord>(rule: RuleData): RuleValue<Row, P> {
 	return Object.freeze({ rule })
 }
 
-/**
- * The one runtime chain every context shares — non-generic on purpose. The
- * typed chain interfaces apply at the scope factories' boundaries.
- */
 interface RawChain {
 	match(relation: MatchOwner, bindings: Readonly<Record<string, unknown>>): RawChain
 	where(cond: AnyCond): RawChain
@@ -1088,18 +955,15 @@ interface RawChain {
 	find(entries: Readonly<Record<string, unknown>>): RuleValue<never, never>
 }
 
-/** The runtime rule-builder shape beneath every typed scope. */
 interface RawScope extends TermOps {
 	match(relation: MatchOwner, bindings: Readonly<Record<string, unknown>>): RawChain
 	interior(name: string, bindings: Readonly<Record<string, unknown>>): RawChain
 }
 
-/** The declared derived tables a chain may name. */
 type DerivedEnv =
 	| { readonly interiors: readonly InteriorData[] }
 	| { readonly interiors: readonly InteriorData[]; readonly rec: RecHandle | RecHead | RecData }
 
-/** Which rule family a chain builds — plus the schema's runtime class map and theory value (the join judge's authority). */
 type ChainContext = { readonly classes: SchemaClasses; readonly theory: AnySchema } & DerivedEnv &
 	(
 		| { readonly kind: "query" }
@@ -1108,7 +972,6 @@ type ChainContext = { readonly classes: SchemaClasses; readonly theory: AnySchem
 		| { readonly kind: "rec-arm"; readonly self: RecHead }
 	)
 
-/** The diagnostic label of a chain context. */
 function contextLabel(context: ChainContext): string {
 	switch (context.kind) {
 		case "query":
@@ -1122,12 +985,10 @@ function contextLabel(context: ChainContext): string {
 	}
 }
 
-/** RecHandle is name-only staging; RecHead/RecData carry the sealed finds. */
 function isRecHead(rec: RecHandle | RecHead | RecData): rec is RecHead {
 	return Array.isArray((rec as RecHead).finds)
 }
 
-/** Resolves a derived-table name against the context's visible tables. */
 function lookupDerived(context: ChainContext, name: string): DerivedTable {
 	const interior = context.interiors.find(function byName(candidate) {
 		return candidate.name === name
@@ -1156,7 +1017,6 @@ function lookupDerived(context: ChainContext, name: string): DerivedTable {
 	throw errors.new(`${contextLabel(context)}: no derived table named ${name} is in scope`)
 }
 
-/** Validates and records one interior atom per the context's cut. */
 function interiorAdvance(
 	context: ChainContext,
 	state: RuleBuildState,
@@ -1166,11 +1026,6 @@ function interiorAdvance(
 	return advanceInterior(state, lookupDerived(context, name), bindings, "interior")
 }
 
-/**
- * Validates and records one NEGATED finished-table atom — main and interior
- * rules: a finished set is a set. Rec bodies refuse every negation
- * (`NegationInRec` — self is the wall; EDB / earlier-interior is this-cut).
- */
 function notInteriorAdvance(
 	context: ChainContext,
 	state: RuleBuildState,
@@ -1185,7 +1040,6 @@ function notInteriorAdvance(
 	return advanceInterior(state, lookupDerived(context, name), bindings, "negatedInterior")
 }
 
-/** Classifies one find record per the context (interior and rec heads project bound variables only). */
 function findColumns(context: ChainContext, entries: Readonly<Record<string, unknown>>): FindColumn[] {
 	const columns: FindColumn[] = []
 	const derivedHead = context.kind !== "query"
@@ -1204,7 +1058,6 @@ function findColumns(context: ChainContext, entries: Readonly<Record<string, unk
 	return columns
 }
 
-/** Builds one runtime chain (immutably — every step is a fresh chain over fresh state). */
 function makeRawChain(context: ChainContext, state: RuleBuildState): RawChain {
 	const chain: RawChain = {
 		match(relation, bindings) {
@@ -1224,7 +1077,6 @@ function makeRawChain(context: ChainContext, state: RuleBuildState): RawChain {
 	return chain
 }
 
-/** Builds one runtime rule-builder over a context. */
 function makeRawScope(context: ChainContext): RawScope {
 	const scope: RawScope = {
 		...termOps,
@@ -1252,7 +1104,6 @@ function isTypedScope<S>(scope: RawScope): scope is RawScope & S {
 	return typeof scope.match === "function"
 }
 
-/** Builds one query-rule builder (the typed face of the raw builder). */
 function makeQueryRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: AnySchema,
 	env: DerivedEnv
@@ -1264,7 +1115,6 @@ function makeQueryRuleScope<Rels extends SchemaRelations, Classes extends Schema
 	return raw
 }
 
-/** Builds one interior-rule builder. */
 function makeInteriorRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: AnySchema,
 	env: DerivedEnv,
@@ -1277,7 +1127,6 @@ function makeInteriorRuleScope<Rels extends SchemaRelations, Classes extends Sch
 	return raw
 }
 
-/** Builds one rec-arm builder. */
 function makeRecRuleScope<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: AnySchema,
 	env: DerivedEnv,
@@ -1318,15 +1167,13 @@ function makeRecRuleScope<Rels extends SchemaRelations, Classes extends SchemaCl
 	return raw
 }
 
-/** Renders one head column's closed slice for the rule-alignment check's diagnostics. */
 function renderClosedSlice(closed: ClosedRoster | undefined): string {
 	return closed === undefined ? "a bare value" : `a ${closed.name} reference`
 }
 
-/** Renders one head column's signature for the rule-alignment check. */
 function headSignature(column: FindColumn): string {
 	const entry = column.entry
-	if (entry.kind === "var" || entry.kind === "measure") {
+	if (entry.kind === "var") {
 		return `${column.name}:var`
 	}
 	const agg = entry.agg
@@ -1336,12 +1183,6 @@ function headSignature(column: FindColumn): string {
 	return `${column.name}:${agg.op}`
 }
 
-/** The roster a param anchor carries: present exactly on a closed-reference field anchor. */
-function anchorRosterOf(anchor: AnyField | "measure" | undefined): ClosedRoster | undefined {
-	return anchor === "measure" ? undefined : rosterOf(anchor)
-}
-
-/** Renders one param anchor's closedness for the registry's coherence diagnostics. */
 function renderParamAnchor(roster: ClosedRoster | undefined): string {
 	return roster === undefined ? "a non-closed position" : `a ${roster.name} reference`
 }
@@ -1397,8 +1238,8 @@ function paramRegistryOf(
 				)
 			}
 			if (existing.anchor !== undefined && use.anchor !== undefined) {
-				const registered = anchorRosterOf(existing.anchor)
-				const anchored = anchorRosterOf(use.anchor)
+				const registered = rosterOf(existing.anchor)
+				const anchored = rosterOf(use.anchor)
 				if (registered !== anchored) {
 					throw errors.new(
 						`query param ${use.name} is anchored at ${renderParamAnchor(registered)} and at ${renderParamAnchor(anchored)} — a closed-anchored param translates handle names through ONE roster (one name, one domain); name the params differently`
@@ -1433,14 +1274,7 @@ function paramRegistryOf(
 			if (entry === undefined) {
 				throw errors.new(`query param ${name} lost its registry entry`)
 			}
-			/**
-			 * A membership array's handle names are program constants, so the
-			 * entry stores the resolved IMAGE: each name rides the one
-			 * roster-verification point (`taggedHandleId`, through
-			 * `taggedCmpLiteral`) exactly once, HERE — an out-of-roster name
-			 * fails at build, and every execute returns this frozen value by
-			 * reference.
-			 */
+
 			let membership: QueryParam | undefined
 			if (entry.members !== undefined) {
 				const anchor = entry.anchor
@@ -1461,7 +1295,6 @@ function paramRegistryOf(
 	)
 }
 
-/** The runtime query shape beneath the typed `Query` face. */
 interface RawQuery {
 	readonly schema: AnySchema
 	readonly data: QueryData
@@ -1470,7 +1303,6 @@ interface RawQuery {
 	reach(name: string, arms: never): never
 }
 
-/** Asserts every rule in a list derives the same head (name, aggregate shape, closed slice, class). */
 function assertAlignedHeads(label: string, rules: readonly RuleData[]): void {
 	const first = rules[0]
 	if (first === undefined) {
@@ -1509,13 +1341,6 @@ function afterMainError(what: string): Error {
 	)
 }
 
-/**
- * Assembles the runtime query value over completed rules: every rule must
- * derive the SAME head (name and aggregate shape, position for position —
- * the decode labels and the engine's alignment rule agree), and the param
- * registry folds in query-walk order. CQ lowering does not mention rec;
- * Reach carries RecData by value.
- */
 function makeRawQuery(
 	theory: AnySchema,
 	interiors: readonly InteriorData[],
@@ -1575,7 +1400,6 @@ function makeQuery<Rels extends SchemaRelations, Row, P extends ParamsRecord, Cl
 	return makeRawQuery(theory, interiors, rec, rules) as unknown as Query<Rels, Row, P, Classes>
 }
 
-/** Collects one Interior from its builders. */
 function collectInterior<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: Schema<Rels, Classes>,
 	env: DerivedEnv,
@@ -1596,7 +1420,6 @@ function collectInterior<Rels extends SchemaRelations, Classes extends SchemaCla
 	return Object.freeze({ name, finds: first.finds, rules: Object.freeze(rules) })
 }
 
-/** Collects the Rec from tagged base/rec builder arrays. */
 function collectRec<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: Schema<Rels, Classes>,
 	interiors: readonly InteriorData[],
@@ -1646,7 +1469,6 @@ function collectRec<Rels extends SchemaRelations, Classes extends SchemaClasses>
 	return recData
 }
 
-/** Builds the CQ query start (interiors, then reach or the first main rule). */
 function makeQueryStart<Rels extends SchemaRelations, Classes extends SchemaClasses, P extends ParamsRecord>(
 	theory: Schema<Rels, Classes>,
 	interiors: readonly InteriorData[]
@@ -1702,7 +1524,6 @@ function makeQueryStart<Rels extends SchemaRelations, Classes extends SchemaClas
 	return start as unknown as QueryStart<Rels, Classes, P>
 }
 
-/** Builds the Reach query start (rec sealed; only the first main rule remains). */
 function makeQueryReachStart<Rels extends SchemaRelations, Classes extends SchemaClasses, P extends ParamsRecord>(
 	theory: Schema<Rels, Classes>,
 	interiors: readonly InteriorData[],
@@ -1721,24 +1542,12 @@ function makeQueryReachStart<Rels extends SchemaRelations, Classes extends Schem
 	return start as unknown as QueryReachStart<Rels, Classes, P>
 }
 
-/**
- * Opens a query over a schema: `query(S).rule(r => ...)`, optionally with
- * `interior` / `reach` first. Each `.rule` adds one conjunctive rule;
- * multiple rules are the set union. The schema's law-computed class map and
- * theory value ride into every rule builder — the join walls compare
- * against the mint slots off it.
- */
 function query<Rels extends SchemaRelations, Classes extends SchemaClasses>(
 	theory: Schema<Rels, Classes>
 ): QueryStart<Rels, Classes> {
 	return makeQueryStart<Rels, Classes, Record<never, never>>(theory, [])
 }
 
-/**
- * Tags one closed-reference literal: the handle NAME, verified against the
- * roster and translated to its declaration-order row id, tagged u64. THE
- * single roster-verification point of the query surface.
- */
 function taggedHandleId(
 	context: string,
 	closed: { readonly name: string; readonly handles: readonly string[] },
@@ -1756,11 +1565,6 @@ function taggedHandleId(
 	return { kind: "u64", value: BigInt(id) }
 }
 
-/**
- * Tags one literal in an interval element domain: a bigint tags as the
- * element (the membership typing rule's point side), an interval-shaped
- * value as the interval (value equality).
- */
 function taggedAtElementDomain(context: string, element: "u64" | "i64", value: unknown): TaggedValue {
 	if (typeof value === "bigint") {
 		if (element === "u64") {
@@ -1777,10 +1581,6 @@ function taggedAtElementDomain(context: string, element: "u64" | "i64", value: u
 	throw literalShapeError(context, "bigint (point) or { start, end } (interval)", value)
 }
 
-/**
- * Tags one host literal at a FIELD position (atom bindings): the field's
- * structural kind directs the tag, never a guess.
- */
 function taggedLiteral(context: string, field: AnyField, value: unknown): TaggedValue {
 	const roster = rosterOf(field)
 	if (roster !== undefined) {
@@ -1834,18 +1634,7 @@ function taggedLiteral(context: string, field: AnyField, value: unknown): Tagged
  * interval operand of `pointIn(t, span(...))`; under every other operator an
  * interval shape against a scalar sibling stays refused.
  */
-function taggedCmpLiteral(
-	context: string,
-	sibling: AnyField | "measure",
-	value: unknown,
-	op: CmpKind | "binding"
-): TaggedValue {
-	if (sibling === "measure") {
-		if (typeof value !== "bigint") {
-			throw literalShapeError(context, "bigint (the measure is u64)", value)
-		}
-		return { kind: "u64", value }
-	}
+function taggedCmpLiteral(context: string, sibling: AnyField, value: unknown, op: CmpKind | "binding"): TaggedValue {
 	if (rosterOf(sibling) === undefined && sibling.kind === "interval") {
 		return taggedAtElementDomain(context, sibling.element, value)
 	}
@@ -1860,7 +1649,6 @@ function taggedCmpLiteral(
 	return taggedLiteral(context, sibling, value)
 }
 
-/** The shared lowering context of one `lowerQuery` run. */
 interface LowerContext {
 	readonly theory: AnySchema
 	readonly relationIds: ReadonlyMap<string, number>
@@ -1869,12 +1657,10 @@ interface LowerContext {
 	readonly params: ReadonlyMap<string, ParamEntry>
 }
 
-/** One rule's dense variable numbering: first occurrence in written order, keyed on the object REFERENCE. */
 interface VarIds {
 	of(ref: AnyVar): number
 }
 
-/** Creates one rule-scoped variable numberer. */
 function freshVarIds(): VarIds {
 	const assigned = new Map<AnyVar, number>()
 	return {
@@ -1890,7 +1676,6 @@ function freshVarIds(): VarIds {
 	}
 }
 
-/** Resolves a param name to its dense positional id. */
 function paramIdOf(ctx: LowerContext, name: string): number {
 	const id = ctx.paramIds.get(name)
 	if (id === undefined) {
@@ -1899,10 +1684,6 @@ function paramIdOf(ctx: LowerContext, name: string): number {
 	return id
 }
 
-/**
- * Lowers one EDB atom (either polarity). A CLOSED owner lowers through the
- * same edb source, with field ordinals over the SEALED shape.
- */
 function lowerAtom(ctx: LowerContext, atom: AtomData, ids: VarIds): AtomIr {
 	const member = ctx.theory.relations[atom.relation.name]
 	if (member !== atom.relation) {
@@ -1927,7 +1708,6 @@ function lowerAtom(ctx: LowerContext, atom: AtomData, ids: VarIds): AtomIr {
 	return { source: { kind: "edb", relation: relationId }, bindings }
 }
 
-/** Lowers one binding term. A membership ARRAY lowers to the existing param-set term over its content-addressed entry. */
 function lowerBindingTerm(ctx: LowerContext, context: string, binding: BindingEntry, ids: VarIds): TermIr {
 	const bound = binding.term
 	switch (bound.kind) {
@@ -1975,7 +1755,6 @@ function lowerInteriorAtom(
 	return { source: { kind: "interior", interior }, bindings: irBindings }
 }
 
-/** Lowers one comparison side; literals tag by the sibling's anchor (op-aware at `pointIn`). */
 function lowerCmpTerm(ctx: LowerContext, side: CmpTermData, sibling: CmpTermData, ids: VarIds, op: CmpKind): TermIr {
 	switch (side.kind) {
 		case "var":
@@ -1984,13 +1763,11 @@ function lowerCmpTerm(ctx: LowerContext, side: CmpTermData, sibling: CmpTermData
 			return { kind: "param", param: paramIdOf(ctx, side.name) }
 		case "setParam":
 			return { kind: "paramSet", param: paramIdOf(ctx, side.name) }
-		case "measure":
-			return { kind: "measure", var: ids.of(side.ref) }
 		case "literal": {
 			const anchor = cmpAnchorOf(ctx, sibling)
 			if (anchor === undefined) {
 				throw errors.new(
-					"query lowering: a comparison literal needs a bound-variable, measure, or anchored-param sibling to type it"
+					"query lowering: a comparison literal needs a bound-variable or anchored-param sibling to type it"
 				)
 			}
 			return { kind: "literal", value: taggedCmpLiteral("comparison literal", anchor, side.value, op) }
@@ -1998,21 +1775,16 @@ function lowerCmpTerm(ctx: LowerContext, side: CmpTermData, sibling: CmpTermData
 	}
 }
 
-/** Resolves the anchor a comparison literal tags by: the sibling variable's field, the measure, or an anchored param. */
-function cmpAnchorOf(ctx: LowerContext, sibling: CmpTermData): AnyField | "measure" | undefined {
+function cmpAnchorOf(ctx: LowerContext, sibling: CmpTermData): AnyField | undefined {
 	if (sibling.kind === "var") {
 		return sibling.ref.field
 	}
-	if (sibling.kind === "measure") {
-		return "measure"
-	}
 	if (sibling.kind === "param" || sibling.kind === "setParam") {
 		return ctx.params.get(sibling.name)?.anchor
 	}
 	return undefined
 }
 
-/** Lowers one comparison. */
 function lowerComparison(ctx: LowerContext, cmp: CmpData, ids: VarIds): ComparisonIr {
 	if (cmp.op.kind === "allen") {
 		return {
@@ -2028,7 +1800,6 @@ function lowerComparison(ctx: LowerContext, cmp: CmpData, ids: VarIds): Comparis
 	}
 }
 
-/** Lowers one condition node (comparison leaf or and/or tree). */
 function lowerCondition(ctx: LowerContext, cond: CondData, ids: VarIds): ConditionTreeIr {
 	if (cond.kind === "cmp") {
 		return { kind: "leaf", cmp: lowerComparison(ctx, cond, ids) }
@@ -2041,30 +1812,21 @@ function lowerCondition(ctx: LowerContext, cond: CondData, ids: VarIds): Conditi
 	}
 }
 
-/** Lowers one find entry to its per-rule find term. */
 function lowerFind(entry: FindEntryData, ids: VarIds): FindTermIr {
 	if (entry.kind === "var") {
 		return { kind: "var", var: ids.of(entry.over) }
 	}
-	if (entry.kind === "measure") {
-		return { kind: "measure", var: ids.of(entry.over) }
-	}
 	const agg = entry.agg
 	switch (agg.op) {
 		case "count":
 			return { kind: "count" }
-		case "fold": {
-			if ("duration" in agg.over) {
-				return { kind: "aggregateMeasure", op: { kind: agg.fold }, over: ids.of(agg.over.duration) }
-			}
+		case "fold":
 			return { kind: "aggregate", op: { kind: agg.fold }, over: ids.of(agg.over) }
-		}
 		case "pack":
 			return { kind: "pack", over: ids.of(agg.over) }
 	}
 }
 
-/** One aggregate's var-free head-op kind (`AggOp::head_op`). */
 function headOpOf(agg: AggData): HeadOpIr {
 	switch (agg.op) {
 		case "count":
@@ -2076,16 +1838,14 @@ function headOpOf(agg: AggData): HeadOpIr {
 	}
 }
 
-/** One find entry's var-free head shape. */
 function headTermOf(column: FindColumn): HeadTermIr {
 	const entry = column.entry
-	if (entry.kind === "var" || entry.kind === "measure") {
+	if (entry.kind === "var") {
 		return { kind: "var" }
 	}
 	return { kind: "aggregate", op: headOpOf(entry.agg) }
 }
 
-/** Lowers one rule: body walked in written order (var ids by first occurrence), finds last. */
 function lowerRule(ctx: LowerContext, rule: RuleData): RuleIr {
 	const ids = freshVarIds()
 	const atoms: AtomIr[] = []
@@ -2125,11 +1885,6 @@ function lowerRule(ctx: LowerContext, rule: RuleData): RuleIr {
 	}
 }
 
-/**
- * Lowers a query value to the bridge's `QueryIr` — pure and stable:
- * interiors in declaration order, then CQ or Reach, then main. Every
- * registered param must carry a field anchor by now.
- */
 function lowerQuery(q: AnyQuery): ParsedQuery {
 	const theory = q.schema
 	const relationIds = new Map<string, number>()