@ifc-lite/mcp 0.18.0 → 0.20.2

package/dist/tools/diff-authored-keys.js

@@ -9,6 +9,7 @@
  * for size.
  */
 import { EntityExtractor, authoredKeyValue, extractRootAttributesFromEntity, getAttributeNamesAcrossSchemas, parseAuthoredKeySpec, } from '@ifc-lite/parser';
+import { stepText } from '../overlay.js';
 /** Prefix on a fingerprint key taken from an authored property rather than a GlobalId. */
 export const AUTHORED_KEY_PREFIX = 'prop:';
 /**
@@ -19,7 +20,7 @@ export const AUTHORED_KEY_PREFIX = 'prop:';
 export function fallbackPairDuplicateAuthoredKeys(sides, duplicates) {
     if (duplicates.size === 0)
         return;
-    for (const { fingerprints, store } of sides) {
+    for (const { fingerprints, store, overlay } of sides) {
         const extractor = new EntityExtractor(store.source);
         for (const fingerprint of fingerprints) {
             if (!fingerprint.key.startsWith(AUTHORED_KEY_PREFIX))
@@ -27,11 +28,22 @@ export function fallbackPairDuplicateAuthoredKeys(sides, duplicates) {
             const value = fingerprint.key.slice(AUTHORED_KEY_PREFIX.length);
             if (!duplicates.has(value))
                 continue;
+            const named = overlay?.attributes(fingerprint.ref);
+            const positional = overlay?.positionalAttributes?.(fingerprint.ref);
+            const editedGlobalId = named?.has('GlobalId') ? named.get('GlobalId')
+                : positional?.has(0) ? stepText(positional.get(0)) ?? '' : undefined;
+            const createdGlobalId = overlay?.createdEntity(fingerprint.ref)?.globalId;
             const tableGlobalId = store.entities.getGlobalId(fingerprint.ref);
+            // @raw-entity-enumeration-ok collision fallback uses this point source record only after checking effective and created GlobalIds
             const ref = store.entityIndex.byId.get(fingerprint.ref);
             const entity = ref ? extractor.extractEntity(ref) : undefined;
             const sourceGlobalId = entity ? extractRootAttributesFromEntity(entity).globalId : undefined;
-            const globalId = tableGlobalId || sourceGlobalId;
+            // An explicit empty edit clears GlobalId. Falling back to the source
+            // here would resurrect an identity the session no longer has; the
+            // fingerprint builder omits that source entity before this repair pass.
+            const globalId = editedGlobalId !== undefined ? editedGlobalId
+                : createdGlobalId !== undefined ? createdGlobalId
+                    : (tableGlobalId || sourceGlobalId);
             if (!globalId) {
                 throw new Error(`Cannot restore GlobalId for authored-key collision on #${fingerprint.ref}`);
             }
@@ -46,7 +58,7 @@ export function fallbackPairDuplicateAuthoredKeys(sides, duplicates) {
  * owners: a deleted twin no longer contests the key. A created entity has no
  * store row to read and keeps its GlobalId.
  */
-export function authoredKeyResolver(store, overlay, options, extractor, isDependentType) {
+export function authoredKeyResolver(store, overlay, options, extractor, entities) {
     const keySpec = options.keyProperty ? parseAuthoredKeySpec(options.keyProperty) : undefined;
     if (!keySpec)
         return (_expressId, globalId) => globalId;
@@ -55,6 +67,17 @@ export function authoredKeyResolver(store, overlay, options, extractor, isDepend
             const edited = overlay?.attributes(expressId).get('Tag');
             if (edited !== undefined)
                 return edited.trim().length > 0 ? edited.trim() : undefined;
+            const created = overlay?.createdEntity(expressId);
+            // @raw-entity-enumeration-ok Tag slot discovery needs the source class for this one entity when no queued retype or creation supplies it
+            const effectiveType = overlay?.effectiveType?.(expressId)
+                ?? created?.ifcType ?? store.entityIndex.byId.get(expressId)?.type;
+            const tagIndex = effectiveType ? getAttributeNamesAcrossSchemas(effectiveType).indexOf('Tag') : -1;
+            const positional = overlay?.positionalAttributes?.(expressId);
+            if (tagIndex >= 0 && positional?.has(tagIndex))
+                return stepText(positional.get(tagIndex));
+            if (created) {
+                return tagIndex < 0 ? undefined : stepText(created.attributes[tagIndex]);
+            }
         }
         else if (overlay) {
             const set = overlay.propertySets(expressId).find((pset) => pset.name === keySpec.pset);
@@ -72,21 +95,19 @@ export function authoredKeyResolver(store, overlay, options, extractor, isDepend
     // A first pass so a value two entities share can be refused for both,
     // instead of the diff's first-wins index quietly keeping one.
     const owners = new Map();
-    for (const [typeKey, ids] of store.entityIndex.byType) {
-        if (isDependentType(typeKey))
+    const seen = new Set();
+    for (const { expressId } of entities) {
+        if (seen.has(expressId))
             continue;
-        for (const expressId of ids) {
-            if (overlay?.deleted.has(expressId))
-                continue;
-            const value = authoredKeyOf(expressId);
-            if (value === undefined)
-                continue;
-            const list = owners.get(value);
-            if (list)
-                list.push(expressId);
-            else
-                owners.set(value, [expressId]);
-        }
+        seen.add(expressId);
+        const value = authoredKeyOf(expressId);
+        if (value === undefined)
+            continue;
+        const list = owners.get(value);
+        if (list)
+            list.push(expressId);
+        else
+            owners.set(value, [expressId]);
     }
     for (const [value, ids] of owners) {
         if (ids.length > 1)
@@ -126,6 +147,7 @@ export function attributeAcrossSchemas(store, expressId, ifcType, attributeName)
     const index = getAttributeNamesAcrossSchemas(ifcType).indexOf(attributeName);
     if (index < 0)
         return undefined;
+    // @raw-entity-enumeration-ok this point source slot is the base value; buildDataInput applies pending named and positional Tag edits
     const ref = store.entityIndex.byId.get(expressId);
     if (!ref)
         return undefined;

package/dist/tools/diff-authored-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff-authored-keys.js","sourceRoot":"","sources":["../../src/tools/diff-authored-keys.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff-authored-keys.js","sourceRoot":"","sources":["../../src/tools/diff-authored-keys.ts"],"names":[],"mappings":"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"}

package/dist/tools/diff-content.js

@@ -68,8 +68,8 @@ export function contentDiff(left, right, overlays, maxMatches, maxGroupMembers,
     const baseFingerprints = buildModelFingerprints(left.store, overlays.left, adapter);
     const headFingerprints = buildModelFingerprints(right.store, overlays.right, adapter);
     fallbackPairDuplicateAuthoredKeys([
-        { fingerprints: baseFingerprints, store: left.store },
-        { fingerprints: headFingerprints, store: right.store },
+        { fingerprints: baseFingerprints, store: left.store, overlay: overlays.left },
+        { fingerprints: headFingerprints, store: right.store, overlay: overlays.right },
     ], duplicateAuthoredKeys);
     const diff = diffModels(baseFingerprints, headFingerprints, {
         scope: 'data',

package/dist/tools/diff-content.js.map

@@ -1 +1 @@
-{"version":3,"file":"diff-content.js","sourceRoot":"","sources":["../../src/tools/diff-content.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff-content.js","sourceRoot":"","sources":["../../src/tools/diff-content.ts"],"names":[],"mappings":"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"}

package/dist/tools/diff-entity-scope.d.ts

@@ -0,0 +1,53 @@
+/** Membership and type scope for MCP model diff (#5249). */
+import { type EffectiveEntity } from '@ifc-lite/data';
+import { type IfcDataStore } from '@ifc-lite/parser';
+import type { PendingOverlay } from '../overlay.js';
+/** How an uppercase STEP type participates in the comparison. `name` is the
+ *  registry's PascalCase spelling, used instead of the `EntityTable`'s
+ *  `'Unknown'` for entities the table never took in. */
+interface TypeRole {
+    role: 'independent' | 'dependent' | 'unknown';
+    name: string;
+    /** Whether the class is an `IfcTypeObject` — the gate on hashing `Tag`
+     *  (issue #2021). A class no bundled schema declares is `false` rather than
+     *  guessed; the fingerprint then carries no `Tag`, which is the same answer
+     *  as a type object that has none. */
+    typeObject: boolean;
+}
+/**
+ * Classify one STEP type against the three `IfcRoot` branches.
+ *
+ * The chain has to come from **every bundled schema**, not from the parser's
+ * IFC4 codegen pin. `getInheritanceChainForEntity` answers an empty chain for
+ * any class the pin does not carry, and that is not a rare corner: IFC2X3 alone
+ * puts 23 `IfcObjectDefinition` classes there (`IfcMove`, `IfcOrderAction`,
+ * `IfcScheduleTimeControl`, `IfcSpaceProgram`, `IfcServiceLife`, …) and IFC4X3
+ * another 77. Judging those as `unknown` dropped the ones the `EntityTable`
+ * does not hold — real objects with real GlobalIds — and let through the
+ * IFC2X3-only *resource* classes it does hold under a `…STYLE` name, keyed on
+ * the Name in slot 0. Both are wrong answers about an IFC2X3 file, which is
+ * still most of what is in the wild.
+ *
+ * `unknown` is still not `dependent`: a vendor extension no schema declares has
+ * no chain to judge, so it keeps exactly the reach the `EntityTable` already
+ * gave it — which for a `…TYPE` class is a genuine GlobalId, since the parser's
+ * type-object branch is name-based and takes those in. Guessing that an
+ * unrecognised class is an `IfcObject` and reading its source record instead
+ * would cost one STEP extraction per row of every unrecognised bucket in the
+ * model, on every call, to reach entities almost no file has. The price of that
+ * choice is that a vendor `IfcRoot` subtype whose name does not end in `TYPE`
+ * stays uncompared.
+ *
+ * The one name the chain is not needed for is `IFCREL…`: that prefix is the
+ * parser's own rule for taking an unrecognised relationship into the table, and
+ * a relationship is excluded here whether any schema can confirm it or not.
+ * Without this, an unrecognised `IfcRelXxx` would be the single class of entity
+ * that got in through the relationship branch the comparison deliberately shuts.
+ */
+export declare function classifyType(typeKey: string): TypeRole;
+/** Limit the canonical walk to potentially comparable classes before it visits
+ * geometry buckets. Sparse retype destinations and authored classes are added
+ * even when absent from the parsed source index. */
+export declare function comparableEntities(store: IfcDataStore, overlay?: PendingOverlay | null): EffectiveEntity[];
+export {};
+//# sourceMappingURL=diff-entity-scope.d.ts.map

package/dist/tools/diff-entity-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-entity-scope.d.ts","sourceRoot":"","sources":["../../src/tools/diff-entity-scope.ts"],"names":[],"mappings":"AAIA,4DAA4D;AAC5D,OAAO,EAA4B,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAoC,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEpD;;wDAEwD;AACxD,UAAU,QAAQ;IAChB,IAAI,EAAE,aAAa,GAAG,WAAW,GAAG,SAAS,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb;;;0CAGsC;IACtC,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,CAqBtD;AAED;;oDAEoD;AACpD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,GAAG,eAAe,EAAE,CA0B1G"}

package/dist/tools/diff-entity-scope.js

@@ -0,0 +1,94 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+/** Membership and type scope for MCP model diff (#5249). */
+import { iterateEffectiveEntities } from '@ifc-lite/data';
+import { getInheritanceChainAcrossSchemas } from '@ifc-lite/parser';
+/**
+ * Classify one STEP type against the three `IfcRoot` branches.
+ *
+ * The chain has to come from **every bundled schema**, not from the parser's
+ * IFC4 codegen pin. `getInheritanceChainForEntity` answers an empty chain for
+ * any class the pin does not carry, and that is not a rare corner: IFC2X3 alone
+ * puts 23 `IfcObjectDefinition` classes there (`IfcMove`, `IfcOrderAction`,
+ * `IfcScheduleTimeControl`, `IfcSpaceProgram`, `IfcServiceLife`, …) and IFC4X3
+ * another 77. Judging those as `unknown` dropped the ones the `EntityTable`
+ * does not hold — real objects with real GlobalIds — and let through the
+ * IFC2X3-only *resource* classes it does hold under a `…STYLE` name, keyed on
+ * the Name in slot 0. Both are wrong answers about an IFC2X3 file, which is
+ * still most of what is in the wild.
+ *
+ * `unknown` is still not `dependent`: a vendor extension no schema declares has
+ * no chain to judge, so it keeps exactly the reach the `EntityTable` already
+ * gave it — which for a `…TYPE` class is a genuine GlobalId, since the parser's
+ * type-object branch is name-based and takes those in. Guessing that an
+ * unrecognised class is an `IfcObject` and reading its source record instead
+ * would cost one STEP extraction per row of every unrecognised bucket in the
+ * model, on every call, to reach entities almost no file has. The price of that
+ * choice is that a vendor `IfcRoot` subtype whose name does not end in `TYPE`
+ * stays uncompared.
+ *
+ * The one name the chain is not needed for is `IFCREL…`: that prefix is the
+ * parser's own rule for taking an unrecognised relationship into the table, and
+ * a relationship is excluded here whether any schema can confirm it or not.
+ * Without this, an unrecognised `IfcRelXxx` would be the single class of entity
+ * that got in through the relationship branch the comparison deliberately shuts.
+ */
+export function classifyType(typeKey) {
+    const upper = typeKey.toUpperCase();
+    const chain = getInheritanceChainAcrossSchemas(upper);
+    if (chain.length === 0) {
+        return {
+            role: upper.startsWith('IFCREL') ? 'dependent' : 'unknown',
+            name: typeKey,
+            typeObject: false,
+        };
+    }
+    // The chain holds the class itself plus its supertypes; which end the leaf
+    // sits at is the schema source's business — the union walk answers leaf→root
+    // and the IFC4 pin it falls back to answers root→leaf — so find it by name.
+    const name = chain.find((ancestor) => ancestor.toUpperCase() === upper) ?? typeKey;
+    const typeObject = chain.includes('IfcTypeObject');
+    if (!chain.includes('IfcRoot'))
+        return { role: 'dependent', name, typeObject };
+    return {
+        role: chain.includes('IfcObjectDefinition') ? 'independent' : 'dependent',
+        name,
+        typeObject,
+    };
+}
+/** Limit the canonical walk to potentially comparable classes before it visits
+ * geometry buckets. Sparse retype destinations and authored classes are added
+ * even when absent from the parsed source index. */
+export function comparableEntities(store, overlay) {
+    const types = new Set();
+    // @raw-entity-enumeration-ok the diff chooses candidate source CLASS keys only; iterateEffectiveEntities handles membership below
+    for (const type of store.entityIndex.byType.keys()) {
+        if (classifyType(type).role !== 'dependent')
+            types.add(type);
+    }
+    const retypes = overlay?.typeMutations?.();
+    for (const change of retypes?.values() ?? []) {
+        if (classifyType(change.newType).role !== 'dependent')
+            types.add(change.newType);
+    }
+    const created = overlay?.created ?? [];
+    for (const entity of created) {
+        if (classifyType(entity.ifcType).role !== 'dependent')
+            types.add(entity.ifcType);
+    }
+    if (types.size === 0)
+        return [];
+    const createdById = new Map(created.map(entity => [entity.expressId, entity]));
+    const membership = overlay ? {
+        isDeleted: (id) => overlay.deleted.has(id),
+        getNewEntities: () => created.map(entity => ({ expressId: entity.expressId, type: entity.ifcType })),
+        getNewEntity: (id) => {
+            const entity = createdById.get(id);
+            return entity ? { type: entity.ifcType } : null;
+        },
+        getTypeMutations: () => retypes ?? new Map(),
+    } : null;
+    return [...iterateEffectiveEntities(store, membership, [...types])];
+}
+//# sourceMappingURL=diff-entity-scope.js.map

package/dist/tools/diff-entity-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-entity-scope.js","sourceRoot":"","sources":["../../src/tools/diff-entity-scope.ts"],"names":[],"mappings":"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"}

package/dist/tools/diff-fingerprints.d.ts

@@ -86,7 +86,7 @@ import { type EntityFingerprint } from '@ifc-lite/diff';
 import { type IfcDataStore } from '@ifc-lite/parser';
 import { type FingerprintAdapterOptions } from './diff-authored-keys.js';
 export { AUTHORED_KEY_PREFIX, type FingerprintAdapterOptions } from './diff-authored-keys.js';
-import type { PendingOverlay } from '../overlay.js';
+import { type PendingOverlay } from '../overlay.js';
 /** Adapter handle threaded through the diff: the entity's express id. */
 export type DiffRef = number;
 /**

package/dist/tools/diff-fingerprints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff-fingerprints.d.ts","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AAEH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAaL,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAyD,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEhI,OAAO,EAAE,mBAAmB,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAiB,cAAc,EAAE,MAAM,eAAe,CAAC;AAEnE,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAwE7B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,EAC/B,OAAO,GAAE,yBAA8B,GACtC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CA4D9B"}
+{"version":3,"file":"diff-fingerprints.d.ts","sourceRoot":"","sources":["../../src/tools/diff-fingerprints.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmFG;AAEH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAaL,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAyD,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGhI,OAAO,EAAE,mBAAmB,EAAE,KAAK,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAgC,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAElF,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAM7B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,EACnB,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,EAC/B,OAAO,GAAE,yBAA8B,GACtC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAsD9B"}

package/dist/tools/diff-fingerprints.js

@@ -87,63 +87,12 @@
  */
 import { buildComponentFingerprints, buildDataFingerprint, } from '@ifc-lite/diff';
 import { RelationshipType, resolvedTypeName } from '@ifc-lite/data';
-import { EntityExtractor, extractAllEntityAttributes, extractClassificationsOnDemand, extractProjectUnits, extractPropertiesOnDemand, extractQuantitiesOnDemand, extractRootAttributesFromEntity, spatialContainerPath, getInheritanceChainAcrossSchemas, quantitySiScale, roundToScale, scaledPropertyValue, } from '@ifc-lite/parser';
+import { EntityExtractor, extractAllEntityAttributes, extractClassificationsOnDemand, extractProjectUnits, extractPropertiesOnDemand, extractQuantitiesOnDemand, extractRootAttributesFromEntity, spatialContainerPath, getAttributeNamesAcrossSchemas, quantitySiScale, roundToScale, scaledPropertyValue, } from '@ifc-lite/parser';
 import { attributeAcrossSchemas, authoredKeyResolver, override } from './diff-authored-keys.js';
 import { classificationLabel } from './diff-classification-label.js';
+import { classifyType, comparableEntities } from './diff-entity-scope.js';
 export { AUTHORED_KEY_PREFIX } from './diff-authored-keys.js';
-/**
- * Classify one STEP type against the three `IfcRoot` branches.
- *
- * The chain has to come from **every bundled schema**, not from the parser's
- * IFC4 codegen pin. `getInheritanceChainForEntity` answers an empty chain for
- * any class the pin does not carry, and that is not a rare corner: IFC2X3 alone
- * puts 23 `IfcObjectDefinition` classes there (`IfcMove`, `IfcOrderAction`,
- * `IfcScheduleTimeControl`, `IfcSpaceProgram`, `IfcServiceLife`, …) and IFC4X3
- * another 77. Judging those as `unknown` dropped the ones the `EntityTable`
- * does not hold — real objects with real GlobalIds — and let through the
- * IFC2X3-only *resource* classes it does hold under a `…STYLE` name, keyed on
- * the Name in slot 0. Both are wrong answers about an IFC2X3 file, which is
- * still most of what is in the wild.
- *
- * `unknown` is still not `dependent`: a vendor extension no schema declares has
- * no chain to judge, so it keeps exactly the reach the `EntityTable` already
- * gave it — which for a `…TYPE` class is a genuine GlobalId, since the parser's
- * type-object branch is name-based and takes those in. Guessing that an
- * unrecognised class is an `IfcObject` and reading its source record instead
- * would cost one STEP extraction per row of every unrecognised bucket in the
- * model, on every call, to reach entities almost no file has. The price of that
- * choice is that a vendor `IfcRoot` subtype whose name does not end in `TYPE`
- * stays uncompared.
- *
- * The one name the chain is not needed for is `IFCREL…`: that prefix is the
- * parser's own rule for taking an unrecognised relationship into the table, and
- * a relationship is excluded here whether any schema can confirm it or not.
- * Without this, an unrecognised `IfcRelXxx` would be the single class of entity
- * that got in through the relationship branch the comparison deliberately shuts.
- */
-function classifyType(typeKey) {
-    const upper = typeKey.toUpperCase();
-    const chain = getInheritanceChainAcrossSchemas(upper);
-    if (chain.length === 0) {
-        return {
-            role: upper.startsWith('IFCREL') ? 'dependent' : 'unknown',
-            name: typeKey,
-            typeObject: false,
-        };
-    }
-    // The chain holds the class itself plus its supertypes; which end the leaf
-    // sits at is the schema source's business — the union walk answers leaf→root
-    // and the IFC4 pin it falls back to answers root→leaf — so find it by name.
-    const name = chain.find((ancestor) => ancestor.toUpperCase() === upper) ?? typeKey;
-    const typeObject = chain.includes('IfcTypeObject');
-    if (!chain.includes('IfcRoot'))
-        return { role: 'dependent', name, typeObject };
-    return {
-        role: chain.includes('IfcObjectDefinition') ? 'independent' : 'dependent',
-        name,
-        typeObject,
-    };
-}
+import { stepText } from '../overlay.js';
 /**
  * Build one {@link EntityFingerprint} per `IfcObjectDefinition` in a store.
  *
@@ -166,58 +115,52 @@ export function buildModelFingerprints(store, overlay, options = {}) {
     // the (small) set of object types the EntityTable declines to hold.
     const extractor = new EntityExtractor(store.source);
     const units = extractProjectUnits(store.source, store.entityIndex); // for quantitySiScale/scaledPropertyValue
-    const keyOf = authoredKeyResolver(store, overlay, options, extractor, (typeKey) => classifyType(typeKey).role === 'dependent');
-    for (const [typeKey, ids] of store.entityIndex.byType) {
-        // Classified once per type rather than once per entity — the geometry
-        // buckets (IfcCartesianPoint, IfcPolyLoop, …) are the bulk of a real model
-        // and are dismissed here without touching a single row.
+    const entities = comparableEntities(store, overlay);
+    const keyOf = authoredKeyResolver(store, overlay, options, extractor, entities);
+    for (const { expressId, type: typeKey, overlayCreated } of entities) {
+        if (overlayCreated) {
+            const created = overlay?.createdEntity(expressId);
+            if (created && overlay) {
+                const fingerprint = createdFingerprint(created, overlay, units, keyOf(expressId, created.globalId));
+                if (fingerprint)
+                    fingerprints.push(fingerprint);
+            }
+            continue;
+        }
         const type = classifyType(typeKey);
-        if (type.role === 'dependent')
+        if (seen.has(expressId))
             continue;
-        for (const expressId of ids) {
-            if (seen.has(expressId))
-                continue;
-            seen.add(expressId);
-            // Queued for deletion: the session no longer has this entity, so the
-            // comparison must not keep reporting it as present and unchanged.
-            if (overlay?.deleted.has(expressId))
-                continue;
-            let globalId = store.entities.getGlobalId(expressId);
-            let source;
-            if (!globalId && type.role === 'independent') {
-                // In the model but not in the table: a schedule task, an actor, a work
-                // plan. Its GlobalId is in the STEP record, so read it there.
-                source = readRootAttributes(extractor, store, expressId);
-                globalId = source?.globalId ?? '';
-            }
-            // Still nothing: the entity is not an IfcRoot at all (a placement, a
-            // profile, a representation item), so it has no cross-model identity.
-            if (!globalId)
-                continue;
-            const tableType = store.entities.getTypeName(expressId);
-            // `getTypeName` answers 'Unknown' for a row the table never took in. The
-            // registry's own spelling is the honest answer, and it has to be a real
-            // type name: `ifcType` is hashed into the fingerprint and cross-checked
-            // on every content match, so 'Unknown' would pair a task with an actor.
-            const ifcType = source && (!tableType || tableType === 'Unknown') ? type.name : tableType;
-            const input = buildDataInput(store, expressId, ifcType, source, type.typeObject, overlay, units);
-            const fingerprint = {
-                key: keyOf(expressId, globalId),
-                ifcType,
-                dataHash: buildDataFingerprint(input),
-                components: buildComponentFingerprints(input),
-                ref: expressId,
-            };
-            const container = spatialContainerPath(store, expressId);
-            if (container !== undefined)
-                fingerprint.container = container;
-            fingerprints.push(fingerprint);
+        seen.add(expressId);
+        const named = overlay?.attributes(expressId);
+        const positional = overlay?.positionalAttributes?.(expressId);
+        const editedGlobalId = named?.has('GlobalId') ? named.get('GlobalId')
+            : positional?.has(0) ? stepText(positional.get(0)) ?? '' : undefined;
+        let globalId = editedGlobalId ?? store.entities.getGlobalId(expressId);
+        let source;
+        if (!globalId && editedGlobalId === undefined && type.role === 'independent') {
+            // In the model but not in the table: a schedule task, an actor, a work
+            // plan. Its GlobalId is in the STEP record, so read it there.
+            source = readRootAttributes(extractor, store, expressId);
+            globalId = source?.globalId ?? '';
         }
-    }
-    for (const entity of overlay?.created ?? []) {
-        const fingerprint = createdFingerprint(entity, overlay, units);
-        if (fingerprint)
-            fingerprints.push(fingerprint);
+        // Still nothing: the entity is not an IfcRoot at all (a placement, a
+        // profile, a representation item), so it has no cross-model identity.
+        if (!globalId)
+            continue;
+        // The effective class wins over the immutable table's source class.
+        const ifcType = type.name;
+        const input = buildDataInput(store, expressId, ifcType, source, type.typeObject, overlay, units);
+        const fingerprint = {
+            key: keyOf(expressId, globalId),
+            ifcType,
+            dataHash: buildDataFingerprint(input),
+            components: buildComponentFingerprints(input),
+            ref: expressId,
+        };
+        const container = spatialContainerPath(store, expressId);
+        if (container !== undefined)
+            fingerprint.container = container;
+        fingerprints.push(fingerprint);
     }
     return fingerprints;
 }
@@ -240,15 +183,12 @@ export function buildModelFingerprints(store, overlay, options = {}) {
  * hashed IfcRoot attributes: `Name` and `Description` have a payload behind them
  * (STEP slots 0/2/3 are fixed across `IfcRoot` subtypes), `ObjectType` has none
  * (slot 4 is `ApplicableOccurrence` on an `IfcTypeObject`) and so exists only as
- * an override, and `Tag` is the same — an override only, and hashed only when
- * the created class is an `IfcTypeObject` (issue #2021), matching the stored
- * path exactly. Property sets and quantities never had the asymmetry — both
- * were already read through the overlay.
+ * an override. `Tag` is read from its class-specific authored slot or override,
+ * and hashed only for `IfcTypeObject` (issue #2021). Property sets and
+ * quantities are read through the overlay.
  *
- * An authored key (`key_from`) is not resolved for a created entity either: it
- * has no store row for `authoredKeyValue` to read, so it is keyed on the
- * GlobalId the caller gave it. A created entity that duplicates a stored
- * entity's authored value therefore reads as added rather than as a collision.
+ * An authored key is resolved from its effective attributes or property sets,
+ * alongside source entities, so a duplicate is treated as a collision.
  *
  * `predefinedType` and `typeAssignments` are necessarily absent: both are read
  * through the store, which has no row for an entity that exists only in the
@@ -256,17 +196,19 @@ export function buildModelFingerprints(store, overlay, options = {}) {
  * entity that would have matched on those alone therefore reports as added
  * rather than matched, which is the safe direction.
  */
-function createdFingerprint(entity, overlay, units) {
+function createdFingerprint(entity, overlay, units, // scales Qto_ quantities and measure-typed Pset properties to base SI
+key) {
     const type = classifyType(entity.ifcType);
     if (type.role === 'dependent')
         return null;
     const edited = overlay.attributes(entity.expressId);
+    const tagIndex = getAttributeNamesAcrossSchemas(entity.ifcType).indexOf('Tag');
     const input = {
         ifcType: type.name,
         name: override(edited.get('Name'), entity.name),
         description: override(edited.get('Description'), entity.description),
         objectType: override(edited.get('ObjectType'), undefined),
-        tag: type.typeObject ? override(edited.get('Tag'), undefined) : undefined,
+        tag: type.typeObject ? override(edited.get('Tag'), tagIndex < 0 ? undefined : stepText(entity.attributes[tagIndex])) : undefined,
         propertySets: overlay.propertySets(entity.expressId).map((set) => ({
             name: set.name,
             properties: set.properties.map((property) => ({ name: property.name, value: scaledPropertyValue(property.value, property.dataType, units) })),
@@ -281,7 +223,7 @@ function createdFingerprint(entity, overlay, units) {
         typeAssignments: [],
     };
     return {
-        key: entity.globalId,
+        key,
         ifcType: type.name,
         dataHash: buildDataFingerprint(input),
         components: buildComponentFingerprints(input),
@@ -291,6 +233,7 @@ function createdFingerprint(entity, overlay, units) {
 /** IfcRoot attributes straight from the entity's STEP record, for the rows the
  *  columnar `EntityTable` never took in. */
 function readRootAttributes(extractor, store, expressId) {
+    // @raw-entity-enumeration-ok one source record supplies missing table GlobalId; caller applies overlay identity and membership
     const ref = store.entityIndex.byId.get(expressId);
     if (!ref)
         return undefined;
@@ -326,6 +269,11 @@ overlay, units) {
         ? attributeAcrossSchemas(store, expressId, ifcType, 'Tag')
         : undefined;
     const edited = overlay?.attributes(expressId);
+    const tagIndex = isTypeObject ? getAttributeNamesAcrossSchemas(ifcType).indexOf('Tag') : -1;
+    const positional = tagIndex >= 0 ? overlay?.positionalAttributes?.(expressId) : undefined;
+    const effectiveTag = tagIndex >= 0 && positional?.has(tagIndex)
+        ? stepText(positional.get(tagIndex))
+        : override(edited?.get('Tag'), storedTag != null ? String(storedTag) : undefined);
     const propertySets = (overlay
         ? overlay.propertySets(expressId)
         : extractPropertiesOnDemand(store, expressId)).map((set) => ({
@@ -361,9 +309,7 @@ overlay, units) {
         description: override(edited?.get('Description'), store.entities.getDescription(expressId) || source?.description),
         objectType: override(edited?.get('ObjectType'), store.entities.getObjectType(expressId) || source?.objectType),
         predefinedType: predefinedType != null ? String(predefinedType) : undefined,
-        tag: isTypeObject
-            ? override(edited?.get('Tag'), storedTag != null ? String(storedTag) : undefined)
-            : undefined,
+        tag: isTypeObject ? effectiveTag : undefined,
         propertySets,
         quantitySets,
         typeAssignments,