@bldrs-ai/conway 1.569.1545 → 1.570.1544

package/compiled/examples/browser-bundled.cjs

@@ -30,7 +30,7 @@ var import_node_process = require("node:process");
 var readline = __toESM(require("node:readline"), 1);
 
 // compiled/src/version/version.js
-var versionString = "Conway v1.569.1545";
+var versionString = "Conway v1.570.1544";
 
 // compiled/dependencies/conway-geom/interface/conway_geometry.js
 var wasmType = "";

package/compiled/examples/cli-bundled.cjs

@@ -14965,7 +14965,7 @@ ${t5.join("\n")}` : "";
 var import_process = require("process");
 
 // compiled/src/version/version.js
-var versionString = "Conway v1.569.1545";
+var versionString = "Conway v1.570.1544";
 
 // compiled/dependencies/conway-geom/interface/conway_geometry.js
 function pThreadsAllowed() {
@@ -93622,50 +93622,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
     this.aggregateTargetLocalIDs_ = targets;
     return targets;
   }
-  /**
-   * The per-relationship product counts the PAGED walk collected, handed
-   * over and dropped in one call.
-   *
-   * Counts are how many products the aggregates pass will extract for a
-   * relationship — the size of the unit of work
-   * {@link extractRelAggregateGeometryIncremental} steps through — which the
-   * demand pump needs to report progress in products rather than in
-   * relationships (conway#565: SKYLARK250 puts ~1,960 products under one
-   * relationship, so a relationship-counted bar sat at 1/2 for the whole
-   * load).
-   *
-   * **Collected only on the windowed walk, and only because that is the one
-   * place it is free.** {@link ensureAggregateTargetLocalIDs} already pages
-   * and scans every `IfcRelAggregates` record, so the count is the number it
-   * was discarding. A resident model has no such moment worth capturing —
-   * it can read the same records at adopt time for nothing — so the sync
-   * walk collects nothing at all and the whole-model extraction, which
-   * shares that walk, retains nothing.
-   *
-   * **Handed over rather than cached** (conway#569 review). The prefix the
-   * pump builds from these is itself the durable structure; keeping a second
-   * copy for the model's life is retention with no reader. Measured on an
-   * adverse model — 50,000 relationships over 100,000 products, the shape
-   * where relationship count approaches product count — the map holds
-   * 1.75 MB at 36.7 bytes per relationship. Not fatal beside the 16.4 MB
-   * the target Set from the same walk retains, but it is avoidable, and
-   * `setGeometryShard` refuses to run once a worklist exists so the prefix
-   * is built exactly once and there is nothing to hand it to twice.
-   *
-   * **The same number the resident pump derives for itself**, from the same
-   * call: {@link aggregateRelatedProductCount}. Approximate in one
-   * direction only — a `RelatedObjects` list that needs the generated
-   * getter counts 0 — and the pump's own drain condition, not this number,
-   * decides when the pass is finished.
-   *
-   * @return {Map<number, number> | undefined} Counts keyed by relationship
-   * localID, or undefined where no paged walk ran. The caller owns it.
-   */
-  takeAggregateRelatedProductCounts() {
-    const counts = this.pagedAggregateProductCounts_;
-    this.pagedAggregateProductCounts_ = void 0;
-    return counts;
-  }
   /**
    * Windowed twin of {@link aggregateTargetLocalIDs}: page each
    * relationship record before scanning it, so the set is COMPLETE rather
@@ -93702,7 +93658,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
       return this.aggregateTargetLocalIDs_;
     }
     const targets = /* @__PURE__ */ new Set();
-    const counts = /* @__PURE__ */ new Map();
     const wave = Math.max(1, Math.floor(waveSize));
     let pending = [];
     const drain = async () => {
@@ -93715,7 +93670,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
         await Promise.all([...pinned].map((localID) => this.model.ensureResidentByLocalID(localID)));
         for (const relAggregate of pending) {
           this.addAggregateTargets_(relAggregate, targets, true);
-          counts.set(relAggregate.localID, this.aggregateRelatedProductCount(relAggregate));
         }
       } finally {
         this.model.releaseSourceViews(pinned);
@@ -93733,7 +93687,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
       await drain();
     }
     this.aggregateTargetLocalIDs_ = targets;
-    this.pagedAggregateProductCounts_ = counts;
     this.aggregateTargetsPaged_ = true;
     return targets;
   }
@@ -93776,13 +93729,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
    * past that point would defer products the pass will never reach, i.e.
    * extract them in neither pass.
    *
-   * Deliberately NOT the place the progress denominator is counted, even
-   * though the entries pass through here for free and, since conway#568,
-   * through the same classification: `targets` is a Set over the WHOLE
-   * model, so a product reached through two relationships collapses into
-   * one entry here while costing the pass a step in each. See
-   * {@link aggregateRelatedProductCount}.
-   *
    * @param relAggregate The relationship to scan.
    * @param targets Accumulator.
    * @param strictResidency When set, a non-resident read propagates instead
@@ -94271,53 +94217,6 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
     }
     return productLocalIDs;
   }
-  /**
-   * How many products the aggregates pass will actually extract from one
-   * relationship — the size of the unit of work
-   * {@link extractRelAggregateGeometryIncremental} steps through, and the
-   * per-relationship term of the demand pumps' progress denominator
-   * (conway#565).
-   *
-   * **Derived through the pass's own path** —
-   * {@link relatedAggregateProductLocalIDs} and so
-   * {@link relatedProductByExpressID_} — rather than counted off the
-   * target scan, which has the same entries in hand for free.
-   *
-   * The boundary is why. An entry the classification throws on — a
-   * reference that resolves to nothing, or to something that is not an
-   * `IfcObjectDefinition` — ENDS the relationship: the pass's permissive
-   * catch abandons every product after it. A count that skipped the bad
-   * entry and kept going put work in the denominator that would never run,
-   * and the bar then jumped the whole abandoned tail when the relationship
-   * terminated (conway#569 review). On SKYLARK's shape — one relationship
-   * over ~1,960 products — that jump is the entire bar.
-   * {@link relatedAggregateProductLocalIDs} stops where the pass stops;
-   * {@link addAggregateTargets_}, whose Set collapses a product shared by
-   * two relationships, could not carry the number anyway.
-   *
-   * It is still only a PREDICTION of where the pass stops — see the
-   * `TODO(conway#574)` in `IfcApiProxyIfc.demandProgress_`.
-   *
-   * Costs no source bytes beyond the relationship's own record:
-   * `getTypedElementByExpressID` builds its descriptor from the columns
-   * (conway#566 swept exactly this call over SKYLARK250's 7,818,778
-   * records behind an exhausted window — 0 throws, 0 store bytes). That is
-   * what lets the paged walk call it inside a wave, where only the
-   * relationship record is resident, as well as the resident pump calling
-   * it at worklist-adopt time.
-   *
-   * **0 for a `RelatedObjects` list only the generated getter can
-   * resolve** — an inline entity, `$` or junk. Counting those exactly means
-   * materialising the array both callers exist to avoid, and an under-count
-   * only pauses the bar short of full: `remaining` is derived from the
-   * cursors, never from this.
-   *
-   * @param relAggregate The relationship to cost.
-   * @return {number} Related products the aggregates pass will extract.
-   */
-  aggregateRelatedProductCount(relAggregate) {
-    return this.relatedAggregateProductLocalIDs(relAggregate)?.length ?? 0;
-  }
   /**
    * Page the closures of a contiguous run of
    * {@link relatedAggregateProductLocalIDs} entries.
@@ -94367,15 +94266,7 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
         hop.push(localID);
         await this.model.ensureResidentByLocalID(localID);
       }
-      let related;
-      try {
-        related = relAggregate.RelatedObjects;
-      } catch (error) {
-        if (error instanceof StepBufferNotResidentError) {
-          throw error;
-        }
-        return;
-      }
+      const related = relAggregate.RelatedObjects;
       if (related !== null && related !== void 0) {
         for (const product of related) {
           await this.ensureResidentForProductExtract(product.localID, pinned, leafSpans);
@@ -94447,29 +94338,21 @@ var IfcGeometryExtraction = class _IfcGeometryExtraction {
    * @param relAggregate The relationship to read.
    * @return {number[] | undefined} The related objects' express IDs in
    * record order, or undefined when the list holds an entry that is not a
-   * `#N` reference — an inline entity, `$`, junk, or a field that is not a
-   * list at all. Only the generated getter can resolve (or reject) those,
-   * so the caller falls back to it rather than guessing. A non-residency
-   * failure propagates instead: see the catch.
+   * `#N` reference — an inline entity, `$`, or junk. Only the generated
+   * getter can resolve (or reject) those, so the caller falls back to it
+   * rather than guessing.
    */
   relatedObjectExpressIDs_(relAggregate) {
     const expressIDs = [];
     let allReferences = true;
-    try {
-      relAggregate.forEachReferenceInField(REL_AGGREGATES_RELATED_OFFSET, REL_AGGREGATES_RELATED_BASE, REL_AGGREGATES_RELATED_DEPTH, (expressID) => {
-        if (expressID === void 0) {
-          allReferences = false;
-          return false;
-        }
-        expressIDs.push(expressID);
-        return true;
-      });
-    } catch (error) {
-      if (error instanceof StepBufferNotResidentError) {
-        throw error;
+    relAggregate.forEachReferenceInField(REL_AGGREGATES_RELATED_OFFSET, REL_AGGREGATES_RELATED_BASE, REL_AGGREGATES_RELATED_DEPTH, (expressID) => {
+      if (expressID === void 0) {
+        allReferences = false;
+        return false;
       }
-      return void 0;
-    }
+      expressIDs.push(expressID);
+      return true;
+    });
     return allReferences ? expressIDs : void 0;
   }
   /**

package/compiled/examples/cli-step-bundled.cjs

@@ -15943,7 +15943,7 @@ var ParsingBuffer = class {
 };
 
 // compiled/src/version/version.js
-var versionString = "Conway v1.569.1545";
+var versionString = "Conway v1.570.1544";
 
 // compiled/dependencies/conway-geom/interface/conway_geometry.js
 function pThreadsAllowed() {

package/compiled/examples/validator-bundled.cjs

@@ -944,7 +944,7 @@ var EntityTypesIfcCount = 909;
 var entity_types_ifc_gen_default = EntityTypesIfc;
 
 // compiled/src/version/version.js
-var versionString = "Conway v1.569.1545";
+var versionString = "Conway v1.570.1544";
 
 // compiled/dependencies/conway-geom/interface/conway_geometry.js
 var wasmType = "";

package/compiled/src/compat/web-ifc/ifc_api_proxy_ifc.d.ts

@@ -128,24 +128,6 @@ export declare class IfcApiProxyIfc implements IfcApiModelPassthrough {
     private demandAggregates_?;
     /** Cursor into demandAggregates_ — items before it are extracted. */
     private demandAggregatesCursor_;
-    /**
-     * Running total of stepper steps the aggregates pass will cost, indexed
-     * like demandAggregates_: entry i is the steps for relationships
-     * `[0, i)`, so the array is one longer than the worklist and its last
-     * entry is the pass's whole cost.
-     *
-     * **The unit is one pump budget unit, not one product** (conway#565).
-     * A relationship costs `products + 1`: the stepper yields once per
-     * related product it extracts, and the final `next()` that returns
-     * `done` also spends a unit of the pump's budget. Counting products
-     * alone would leave `extracted` and `remaining` disagreeing by one per
-     * relationship at every boundary, which is the wrinkle #565 flagged to
-     * decide rather than trip over. In this unit they are commensurate:
-     * `remaining` falls by exactly what `extracted` reports.
-     *
-     * Undefined until a worklist is adopted.
-     */
-    private demandAggregateStepPrefix_?;
     /**
      * The relationship at demandAggregatesCursor_, part-way through its
      * related products. A batch budget subdivides ONE relationship rather
@@ -811,41 +793,6 @@ export declare class IfcApiProxyIfc implements IfcApiModelPassthrough {
      * a previous walk would otherwise hold both.
      */
     private releaseDemandAggregate_;
-    /**
-     * Cost every relationship in the adopted worklist, in pump budget units,
-     * as the running prefix demandAggregateStepPrefix_ describes.
-     *
-     * Called from both worklist installers rather than lazily in the pump:
-     * the windowed half of the counts comes from the aggregate-target walk,
-     * which has already run by the time a worklist exists (the async
-     * installer awaits its paged twin first), so there is no point later at
-     * which this gets cheaper.
-     */
-    private adoptAggregateStepPrefix_;
-    /**
-     * The geometry phase's denominator and what is left of it, both in pump
-     * budget units — products for the per-product pass, stepper steps for the
-     * aggregates pass.
-     *
-     * Shared by the two pumps so the synchronous embedder and the async pump
-     * Share drives report the same numbers. conway#565 is what happens when
-     * they do not have one definition: `aggregates.length` counted a
-     * relationship as one unit however many products it carried, so
-     * SKYLARK250 — 0 per-product entries and 2 relationships, one holding
-     * ~1,960 products — reported `1/2` for 186 consecutive events across a
-     * minute and a half of extraction.
-     *
-     * **`remaining` is derived from the cursors, never from the estimate.**
-     * Callers pump until it reads 0, so the drain test has to be exact even
-     * where the counts are approximate (see
-     * {@link IfcGeometryExtraction.aggregateRelatedProductCount}). It reads 0
-     * exactly when the pass is drained, and is floored at 1 while any work is
-     * outstanding — an under-counted relationship makes the bar pause just
-     * short of full, not finish early.
-     *
-     * @return {object} `totalWork` for the phase and `remaining` of it.
-     */
-    private demandProgress_;
     private pumpGeometryBatch_;
     /**
      * Walk the scene and emit every not-yet-captured placed instance as

package/compiled/src/compat/web-ifc/ifc_api_proxy_ifc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ifc_api_proxy_ifc.d.ts","sourceRoot":"","sources":["../../../../src/compat/web-ifc/ifc_api_proxy_ifc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ifc_api_proxy_ifc.d.ts","sourceRoot":"","sources":["../../../../src/compat/web-ifc/ifc_api_proxy_ifc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAQ/C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,YAAY,MAAM,0BAA0B,CAAA;AACnD,OAAO,EACL,QAAQ,EACR,WAAW,EACX,WAAW,EACX,cAAc,EACd,cAAc,EACd,WAAW,EACX,MAAM,EACP,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,qBAAqB,EAA8B,MAAM,iCAAiC,CAAA;AACnG,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAA;AAGrC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAqBrD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAE3D,OAAO,EAAyB,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AA2DhG;;;;;GAKG;AACH,UAAU,iBAAiB;IACzB,UAAU,EAAE,cAAc,CAAA;IAC1B,4DAA4D;IAC5D,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;uEACmE;IACnE,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAA;IACpC;;qEAEiE;IACjE,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,EAAE,eAAe,CAAA;IACtB,cAAc,EAAE,qBAAqB,CAAA;IACrC,gBAAgB,EAAE,MAAM,CAAA;IACxB,wEAAwE;IACxE,OAAO,CAAC,EAAE,eAAe,CAAA;CAC1B;AA6CD,qBAAa,cAAe,YAAW,sBAAsB;aAyMvC,OAAO,EAAE,MAAM;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;IA1M9B,EAAE,CAAC,EAAE,GAAG,CAAY;IAEpB,KAAK,EACH;QAAC,YAAY;QACX,eAAe;QACf,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC/C,GAAG,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC,CAAC;QAE1D,MAAM,CAAC,QAAQ,CAAC;QAAE,QAAQ,CAAC,IAAI;KAAC,CAAA;IACpC,UAAU,EAAE,cAAc,CAAA;IAE1B,yEAAyE;IACzE,OAAO,CAAC,eAAe,CAAuB;IAE9C,iEAAiE;IACjE,OAAO,CAAC,aAAa,CAAiB;IAEtC,4EAA4E;IAC5E,OAAO,CAAC,gBAAgB,CAAC,CAAiB;IAE1C,yEAAyE;IACzE,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,sEAAsE;IACtE,OAAO,CAAC,eAAe,CAAC,CAAU;IAElC;;;;;;;OAOG;IACH;;;;;;;OAOG;IACH,OAAO,CAAC,kBAAkB,CAAI;IAE9B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA4B;IAEhE,sEAAsE;IAGtE,OAAO,CAAC,MAAM,CAAC,CAAkC;IAEjD,OAAO,CAAC,aAAa,CAAI;IAEzB,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAO/B;IAED;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,iBAAiB,CAAC,CAAoB;IAE9C,qEAAqE;IACrE,OAAO,CAAC,uBAAuB,CAAI;IAEnC;;;;;;;;OAQG;IACH,OAAO,CAAC,uBAAuB,CAAC,CAAsC;IAEtE;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB,CAAC,CAAuB;IAErD;;;;OAIG;IACH,OAAO,CAAC,qBAAqB,CAAI;IAEjC;;;;;;;;;OASG;IACH,OAAO,CAAC,mBAAmB,CAAC,CAAU;IAEtC;;6DAEyD;IACzD,OAAO,CAAC,eAAe,CAAQ;IAE/B;;;;;;;;;;OAUG;IACH,OAAO,CAAC,8BAA8B,CAAiB;IAEvD;;;;;;;;;;OAUG;IACH,OAAO,CAAC,qBAAqB,CAAiB;IAE9C,cAAc,EAAE,OAAO,CAAQ;IAC/B,mBAAmB,EAAE,MAAM,CAAI;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAmD;IAGrE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAK1B;IAED;;OAEG;IACH,UAAU,gBAA0B;IAEpC;;;;OAIG;gBAGiB,OAAO,EAAE,MAAM,EAC/B,IAAI,EAAE,UAAU,EACC,UAAU,EAAE,GAAG,EACf,QAAQ,CAAC,EAAE,cAAc,YAAA,EAC1C,WAAW,CAAC,EAAE,iBAAiB;IAoLnC;;;;;;;;;;OAUG;WACiB,WAAW,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,GAAG,EACf,QAAQ,CAAC,EAAE,cAAc,GAAI,OAAO,CAAC,cAAc,CAAC;IAQxD;;;;;;;;;;;;;;;OAeG;WACiB,cAAc,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,GAAG,EACf,QAAQ,CAAC,EAAE,cAAc,GAAI,OAAO,CAAC,cAAc,CAAC;IAQxD;;;;;;;;;;;;;;;OAeG;WACiB,cAAc,CAC9B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,GAAG,EACf,QAAQ,CAAC,EAAE,cAAc,GAAI,OAAO,CAAC,cAAc,CAAC;IAQxD;;;;;;;;;;;OAWG;WACiB,eAAe,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,qBAAqB,EAC5B,UAAU,EAAE,GAAG,EACf,QAAQ,CAAC,EAAE,cAAc,GAAI,OAAO,CAAC,cAAc,CAAC;IASxD;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAwCtC;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;IAU1B;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;IAsF9B;;;;;;;;;OASG;mBACkB,oBAAoB;IAsFzC;;;;;;;;;;;;;;;;;;;;;;OAsBG;mBACkB,4BAA4B;IA6KjD;;;;;;;;;;;;;;;;OAgBG;mBACkB,sBAAsB;IAyP3C;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IA4BxC;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM;IAM9C;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAO5C;;;;;;OAMG;IACH,WAAW,CAAC,iBAAiB,EAAE,MAAM,GAAG,WAAW;IA6BnD;;;;;;OAMG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,OAAe;IA0BnD;;;;;;;;;;;;OAYG;IACH,qBAAqB,CAAC,SAAS,EAAE,MAAM,GACrC;QAAE,IAAI,CAAC,EAAE,eAAe,CAAC;QACvB,QAAQ,CAAC,EAAE,eAAe,CAAC;QAC3B,QAAQ,CAAC,EAAE,eAAe,CAAA;KAAE;IAoChC;;;;;;OAMG;IACH,kBAAkB,IAAI,IAAI;IAI1B;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED;;;;OAIG;IACH,IAAI,cAAc,IAAI;QACpB,UAAU,EAAE,MAAM,CAAA;QAClB,SAAS,EAAE,MAAM,CAAA;QACjB,SAAS,EAAE,MAAM,CAAA;QACjB,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;QAChB,MAAM,EAAE,MAAM,CAAA;KACf,CAEA;IAED;;;;;;;;;;OAUG;IACH,0BAA0B,CACtB,KAAK,EAAE,qBAAqB,EAC5B,UAAU,CAAC,EAAE,MAAM,EACnB,iBAAiB,CAAC,EAAE,MAAM,GAAI,IAAI;IAItC;;;;;;;;;;;OAWG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D;;;;;;;;;;;OAWG;IACH,cAAc,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAI1C;;;;OAIG;IACH,iBAAiB,IAAI,MAAM,CAAC,WAAW,CAAC;IAoBxC;;;;OAIG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG;IAIzB;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI;IAkB5B;;;;;OAKG;IACH,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW;IAgD9C;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,WAAW;IAIlC;;;;;OAKG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IA6ChD;;;;OAIG;IACH,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC;IA0C7B;;;;OAIG;IACH,yBAAyB,CAAC,oBAAoB,EAAE,KAAK,CAAC,MAAM,CAAC;IAU7D;;;;OAIG;IACH,qBAAqB,IAAI,KAAK,CAAC,MAAM,CAAC;IAetC;;;;;;OAMG;IACH,sBAAsB,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvC;;;;;OAKG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY;IAIvD;;;;;OAKG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,WAAW;IAIrD;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,YAAY,GAAG,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAC/E,YAAY,GAAG,WAAW;IAe5B;;;;OAIG;IACH,UAAU;IAIV;;;;;;;;;;;;;OAaG;IACH,eAAe,IAAI,OAAO;IAoC1B;0EACsE;IACtE,OAAO,CAAC,SAAS,CAAQ;IAEzB;;;;;;;;;;;;;;;;;OAiBG;IACH,oBAAoB,CAChB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GAAI;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC;IAoBrF;;;;;;;;;OASG;IACG,yBAAyB,CAC3B,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,GACvC,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAC,CAAC;IA2KnD;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IA+C9B;;;;;;;;;;;;;;;OAeG;YACW,2BAA2B;IA8CzC;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAa7B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,sBAAsB;IAuD9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACI,oBAAoB,CAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAI,IAAI;IAoEtD;;;;;;;;;;;;;;;;;;;OAmBG;IACI,gBAAgB,CAAE,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAI,IAAI;IAiIzE;;;;;;;OAOG;IACH;;;;;;;;;;;;OAYG;IACH;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,wBAAwB;IA+ChC;;;;;;;;;OASG;IACH,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,kBAAkB;IAkH1B;;;;;;;;;;;;;;;;;;;OAmBG;IACH;;;;;;;;;;;;;;;OAeG;IACI,iBAAiB,CAAE,KAAK,EAAE,MAAM,GAAI;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE;IASrF,OAAO,CAAC,gBAAgB;IAkNxB;;;;OAIG;IACH,eAAe,CAAE,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI;IAuQvD;;;;;OAKG;IACH,wBAAwB,CACpB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EACpB,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI;IAgK1C;;;;OAIG;IACH,eAAe,IAAI,MAAM,CAAC,QAAQ,CAAC;IA2MnC;;;;;OAKG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ;IAqDxC;;;;;OAKG;IACH,4BAA4B,IAAI,IAAI;CAwBrC"}

package/compiled/src/compat/web-ifc/ifc_api_proxy_ifc.js

@@ -1508,10 +1508,11 @@ export class IfcApiProxyIfc {
         }
         const products = this.demandProducts_ ?? [];
         const aggregates = this.demandAggregates_ ?? [];
+        const totalWork = products.length + aggregates.length;
         const budget = Math.max(batchSize, 1);
         let extracted = 0;
         if (this.progressTracker_ !== void 0 && !this.geometryPhaseStarted_) {
-            this.progressTracker_.beginPhase("geometry", "products", this.demandProgress_().totalWork);
+            this.progressTracker_.beginPhase("geometry", "products", totalWork);
             this.geometryPhaseStarted_ = true;
         }
         const productEnd = Math.min(this.demandCursor_ + budget, products.length);
@@ -1618,7 +1619,8 @@ export class IfcApiProxyIfc {
         // this batch is about to deliver and re-extract them immediately. A
         // no-op unless a budget is configured.
         this.model[0].geometryResidency.evictToBudget();
-        const { totalWork, remaining } = this.demandProgress_();
+        const remaining = (products.length - this.demandCursor_) +
+            (aggregates.length - this.demandAggregatesCursor_);
         const windowMb = this.model[0].residentSourceBytes / BYTES_PER_MIB;
         if (this.progressTracker_ !== void 0) {
             const completed = totalWork - remaining;
@@ -1765,7 +1767,6 @@ export class IfcApiProxyIfc {
         this.demandAggregates_ = aggregates;
         this.demandCursor_ = 0;
         this.demandAggregatesCursor_ = 0;
-        this.adoptAggregateStepPrefix_();
     }
     /**
      * Install the worklists narrowed to this instance's shard.
@@ -1817,7 +1818,6 @@ export class IfcApiProxyIfc {
         this.releaseDemandAggregate_();
         this.demandCursor_ = 0;
         this.demandAggregatesCursor_ = 0;
-        this.adoptAggregateStepPrefix_();
     }
     /**
      * Hand this model the recentre frame to apply, instead of letting it
@@ -2132,97 +2132,12 @@ export class IfcApiProxyIfc {
         this.demandAggregatePager_?.release();
         this.demandAggregatePager_ = void 0;
     }
-    /**
-     * Cost every relationship in the adopted worklist, in pump budget units,
-     * as the running prefix demandAggregateStepPrefix_ describes.
-     *
-     * Called from both worklist installers rather than lazily in the pump:
-     * the windowed half of the counts comes from the aggregate-target walk,
-     * which has already run by the time a worklist exists (the async
-     * installer awaits its paged twin first), so there is no point later at
-     * which this gets cheaper.
-     */
-    adoptAggregateStepPrefix_() {
-        const aggregates = this.demandAggregates_ ?? [];
-        const prefix = new Array(aggregates.length + 1);
-        // Taken, not read: the extraction hands the map over and drops its own
-        // reference, so nothing outlives this loop but the prefix — which is
-        // the structure the pump actually needs (conway#569 review). Undefined
-        // on a resident source, which never ran the paged walk.
-        const paged = this.conwayGeometry_.takeAggregateRelatedProductCounts();
-        let running = 0;
-        prefix[0] = 0;
-        for (let where = 0; where < aggregates.length; ++where) {
-            const relAggregate = aggregates[where];
-            // One definition of the count, whichever source it comes from: the
-            // windowed walk fills `paged` by calling aggregateRelatedProductCount
-            // while the record is resident, and a resident model calls it right
-            // here for nothing — no paging, no wave. The map is a cache of that
-            // call, not a second way of computing it (conway#569 review), which
-            // is what keeps a windowed load and a resident load of the same model
-            // reporting the same denominator.
-            const related = paged?.get(relAggregate.localID) ??
-                this.conwayGeometry_.aggregateRelatedProductCount(relAggregate);
-            // +1 for the terminating next(): see demandAggregateStepPrefix_.
-            running += related + 1;
-            prefix[where + 1] = running;
-        }
-        this.demandAggregateStepPrefix_ = prefix;
-    }
-    /**
-     * The geometry phase's denominator and what is left of it, both in pump
-     * budget units — products for the per-product pass, stepper steps for the
-     * aggregates pass.
-     *
-     * Shared by the two pumps so the synchronous embedder and the async pump
-     * Share drives report the same numbers. conway#565 is what happens when
-     * they do not have one definition: `aggregates.length` counted a
-     * relationship as one unit however many products it carried, so
-     * SKYLARK250 — 0 per-product entries and 2 relationships, one holding
-     * ~1,960 products — reported `1/2` for 186 consecutive events across a
-     * minute and a half of extraction.
-     *
-     * **`remaining` is derived from the cursors, never from the estimate.**
-     * Callers pump until it reads 0, so the drain test has to be exact even
-     * where the counts are approximate (see
-     * {@link IfcGeometryExtraction.aggregateRelatedProductCount}). It reads 0
-     * exactly when the pass is drained, and is floored at 1 while any work is
-     * outstanding — an under-counted relationship makes the bar pause just
-     * short of full, not finish early.
-     *
-     * @return {object} `totalWork` for the phase and `remaining` of it.
-     */
-    demandProgress_() {
-        const products = this.demandProducts_ ?? [];
-        const aggregates = this.demandAggregates_ ?? [];
-        // TODO(conway#574): the prefix is a PREDICTION, and the pass has more
-        // early-abandon points than it enumerates — a product whose extraction
-        // throws abandons the relationship too, and the unrun tail drops in one
-        // step when the cursor advances. The fix is to adjust the prefix from
-        // the stepper's actual termination rather than to add a reason at a
-        // time; three review rounds found three boundaries.
-        const prefix = this.demandAggregateStepPrefix_ ?? [0];
-        const aggregateSteps = prefix[prefix.length - 1];
-        const totalWork = products.length + aggregateSteps;
-        const drained = this.demandAggregateStepper_ === void 0 &&
-            this.demandAggregatesCursor_ >= aggregates.length;
-        let aggregateRemaining = 0;
-        if (!drained) {
-            const cursor = Math.min(this.demandAggregatesCursor_, aggregates.length);
-            const inFlight = Math.min(this.demandAggregateSteps_, (prefix[cursor + 1] ?? prefix[cursor]) - prefix[cursor]);
-            aggregateRemaining =
-                Math.max(1, aggregateSteps - (prefix[cursor] + inFlight));
-        }
-        return {
-            totalWork,
-            remaining: (products.length - this.demandCursor_) + aggregateRemaining,
-        };
-    }
     pumpGeometryBatch_(batchSize, meshCallback) {
         const products = this.demandProducts_ ?? [];
         const aggregates = this.demandAggregates_ ?? [];
+        const totalWork = products.length + aggregates.length;
         if (this.progressTracker_ !== void 0 && !this.geometryPhaseStarted_) {
-            this.progressTracker_.beginPhase("geometry", "products", this.demandProgress_().totalWork);
+            this.progressTracker_.beginPhase("geometry", "products", totalWork);
             this.geometryPhaseStarted_ = true;
         }
         const budget = Math.max(batchSize, 1);
@@ -2250,7 +2165,6 @@ export class IfcApiProxyIfc {
                 if (this.demandAggregateStepper_ === void 0) {
                     this.demandAggregateStepper_ =
                         this.conwayGeometry_.extractRelAggregateGeometryIncremental(aggregates[this.demandAggregatesCursor_]);
-                    this.demandAggregateSteps_ = 0;
                 }
                 let done;
                 try {
@@ -2261,19 +2175,12 @@ export class IfcApiProxyIfc {
                     // way out of the stepper by exception. Drop the half-consumed
                     // stepper but leave the cursor, so a retry re-runs the
                     // relationship from the top exactly as it did when this was one
-                    // unyielding call — which is why the step count resets with it.
+                    // unyielding call.
                     this.demandAggregateStepper_ = void 0;
-                    this.demandAggregateSteps_ = 0;
                     throw error;
                 }
-                // Counted on this pump too, not just the async twin: it is what
-                // demandProgress_ reads to place the bar inside the relationship in
-                // flight, and a synchronous embedder reporting the old numbers is
-                // half of conway#565 left in place.
-                ++this.demandAggregateSteps_;
                 if (done) {
                     this.demandAggregateStepper_ = void 0;
-                    this.demandAggregateSteps_ = 0;
                     ++this.demandAggregatesCursor_;
                 }
                 ++extracted;
@@ -2301,13 +2208,15 @@ export class IfcApiProxyIfc {
         // embedder and the test suite drive, and a budget honoured on only
         // one of them is a budget that silently does not apply.
         this.model[0].geometryResidency.evictToBudget();
-        const { totalWork, remaining } = this.demandProgress_();
+        const remaining = (products.length - this.demandCursor_) +
+            (aggregates.length - this.demandAggregatesCursor_);
         if (this.progressTracker_ !== void 0) {
+            const completed = totalWork - remaining;
             if (remaining === 0) {
                 this.progressTracker_.endPhase(totalWork);
             }
             else {
-                this.progressTracker_.update(totalWork - remaining);
+                this.progressTracker_.update(completed);
             }
         }
         return {

package/compiled/src/ifc/ifc_geometry_extraction.d.ts

@@ -1106,7 +1106,6 @@ export declare class IfcGeometryExtraction {
     private static readonly AGGREGATE_TARGET_WAVE_SIZE_;
     private static readonly AGGREGATE_PREFETCH_WAVE_SIZE_;
     private aggregateTargetLocalIDs_?;
-    private pagedAggregateProductCounts_?;
     private aggregateTargetsPaged_;
     /**
      * Local IDs of every IfcProduct that is a RelatedObject of any
@@ -1129,46 +1128,6 @@ export declare class IfcGeometryExtraction {
      * pass; empty for models without IfcRelAggregates.
      */
     aggregateTargetLocalIDs(): Set<number>;
-    /**
-     * The per-relationship product counts the PAGED walk collected, handed
-     * over and dropped in one call.
-     *
-     * Counts are how many products the aggregates pass will extract for a
-     * relationship — the size of the unit of work
-     * {@link extractRelAggregateGeometryIncremental} steps through — which the
-     * demand pump needs to report progress in products rather than in
-     * relationships (conway#565: SKYLARK250 puts ~1,960 products under one
-     * relationship, so a relationship-counted bar sat at 1/2 for the whole
-     * load).
-     *
-     * **Collected only on the windowed walk, and only because that is the one
-     * place it is free.** {@link ensureAggregateTargetLocalIDs} already pages
-     * and scans every `IfcRelAggregates` record, so the count is the number it
-     * was discarding. A resident model has no such moment worth capturing —
-     * it can read the same records at adopt time for nothing — so the sync
-     * walk collects nothing at all and the whole-model extraction, which
-     * shares that walk, retains nothing.
-     *
-     * **Handed over rather than cached** (conway#569 review). The prefix the
-     * pump builds from these is itself the durable structure; keeping a second
-     * copy for the model's life is retention with no reader. Measured on an
-     * adverse model — 50,000 relationships over 100,000 products, the shape
-     * where relationship count approaches product count — the map holds
-     * 1.75 MB at 36.7 bytes per relationship. Not fatal beside the 16.4 MB
-     * the target Set from the same walk retains, but it is avoidable, and
-     * `setGeometryShard` refuses to run once a worklist exists so the prefix
-     * is built exactly once and there is nothing to hand it to twice.
-     *
-     * **The same number the resident pump derives for itself**, from the same
-     * call: {@link aggregateRelatedProductCount}. Approximate in one
-     * direction only — a `RelatedObjects` list that needs the generated
-     * getter counts 0 — and the pump's own drain condition, not this number,
-     * decides when the pass is finished.
-     *
-     * @return {Map<number, number> | undefined} Counts keyed by relationship
-     * localID, or undefined where no paged walk ran. The caller owns it.
-     */
-    takeAggregateRelatedProductCounts(): Map<number, number> | undefined;
     /**
      * Windowed twin of {@link aggregateTargetLocalIDs}: page each
      * relationship record before scanning it, so the set is COMPLETE rather
@@ -1237,13 +1196,6 @@ export declare class IfcGeometryExtraction {
      * past that point would defer products the pass will never reach, i.e.
      * extract them in neither pass.
      *
-     * Deliberately NOT the place the progress denominator is counted, even
-     * though the entries pass through here for free and, since conway#568,
-     * through the same classification: `targets` is a Set over the WHOLE
-     * model, so a product reached through two relationships collapses into
-     * one entry here while costing the pass a step in each. See
-     * {@link aggregateRelatedProductCount}.
-     *
      * @param relAggregate The relationship to scan.
      * @param targets Accumulator.
      * @param strictResidency When set, a non-resident read propagates instead
@@ -1482,51 +1434,6 @@ export declare class IfcGeometryExtraction {
      * resolve (see {@link relatedObjectExpressIDs_}).
      */
     relatedAggregateProductLocalIDs(relAggregate: IfcRelAggregates): number[] | undefined;
-    /**
-     * How many products the aggregates pass will actually extract from one
-     * relationship — the size of the unit of work
-     * {@link extractRelAggregateGeometryIncremental} steps through, and the
-     * per-relationship term of the demand pumps' progress denominator
-     * (conway#565).
-     *
-     * **Derived through the pass's own path** —
-     * {@link relatedAggregateProductLocalIDs} and so
-     * {@link relatedProductByExpressID_} — rather than counted off the
-     * target scan, which has the same entries in hand for free.
-     *
-     * The boundary is why. An entry the classification throws on — a
-     * reference that resolves to nothing, or to something that is not an
-     * `IfcObjectDefinition` — ENDS the relationship: the pass's permissive
-     * catch abandons every product after it. A count that skipped the bad
-     * entry and kept going put work in the denominator that would never run,
-     * and the bar then jumped the whole abandoned tail when the relationship
-     * terminated (conway#569 review). On SKYLARK's shape — one relationship
-     * over ~1,960 products — that jump is the entire bar.
-     * {@link relatedAggregateProductLocalIDs} stops where the pass stops;
-     * {@link addAggregateTargets_}, whose Set collapses a product shared by
-     * two relationships, could not carry the number anyway.
-     *
-     * It is still only a PREDICTION of where the pass stops — see the
-     * `TODO(conway#574)` in `IfcApiProxyIfc.demandProgress_`.
-     *
-     * Costs no source bytes beyond the relationship's own record:
-     * `getTypedElementByExpressID` builds its descriptor from the columns
-     * (conway#566 swept exactly this call over SKYLARK250's 7,818,778
-     * records behind an exhausted window — 0 throws, 0 store bytes). That is
-     * what lets the paged walk call it inside a wave, where only the
-     * relationship record is resident, as well as the resident pump calling
-     * it at worklist-adopt time.
-     *
-     * **0 for a `RelatedObjects` list only the generated getter can
-     * resolve** — an inline entity, `$` or junk. Counting those exactly means
-     * materialising the array both callers exist to avoid, and an under-count
-     * only pauses the bar short of full: `remaining` is derived from the
-     * cursors, never from this.
-     *
-     * @param relAggregate The relationship to cost.
-     * @return {number} Related products the aggregates pass will extract.
-     */
-    aggregateRelatedProductCount(relAggregate: IfcRelAggregates): number;
     /**
      * Page the closures of a contiguous run of
      * {@link relatedAggregateProductLocalIDs} entries.
@@ -1618,10 +1525,9 @@ export declare class IfcGeometryExtraction {
      * @param relAggregate The relationship to read.
      * @return {number[] | undefined} The related objects' express IDs in
      * record order, or undefined when the list holds an entry that is not a
-     * `#N` reference — an inline entity, `$`, junk, or a field that is not a
-     * list at all. Only the generated getter can resolve (or reject) those,
-     * so the caller falls back to it rather than guessing. A non-residency
-     * failure propagates instead: see the catch.
+     * `#N` reference — an inline entity, `$`, or junk. Only the generated
+     * getter can resolve (or reject) those, so the caller falls back to it
+     * rather than guessing.
      */
     private relatedObjectExpressIDs_;
     /**