@ifc-lite/mcp 0.17.0 → 0.20.2

package/dist/tools/diff-authored-keys.d.ts

@@ -0,0 +1,68 @@
+/**
+ * Attribute reading for the MCP diff adapter, and authored keys (issue #4955): `key_from` keys the
+ * comparison on `Tag` or a `Pset.Prop` instead of GlobalId. Read through the
+ * session OVERLAY, like every other fingerprinted value, so a queued edit or
+ * tombstone is what the comparison sees. Split out of `diff-fingerprints.ts`
+ * for size.
+ */
+import { EntityExtractor, type IfcDataStore } from '@ifc-lite/parser';
+import type { EntityFingerprint } from '@ifc-lite/diff';
+import type { EffectiveEntity } from '@ifc-lite/data';
+import { type PendingOverlay } from '../overlay.js';
+/** Adapter options (issue #4955); the CLI's `FingerprintAdapterOptions` restated. */
+export interface FingerprintAdapterOptions {
+    /** `Tag` or `<PsetName>.<PropertyName>`; see the CLI copy for the rules. */
+    keyProperty?: string;
+    duplicateAuthoredKeys?: Map<string, number[]>;
+}
+/** Prefix on a fingerprint key taken from an authored property rather than a GlobalId. */
+export declare const AUTHORED_KEY_PREFIX = "prop:";
+/**
+ * A collision found on either revision invalidates that authored value on
+ * both. The first side may already have been built when the second reveals the
+ * collision, so repair its key back to the entity's GlobalId before diffing.
+ */
+export declare function fallbackPairDuplicateAuthoredKeys(sides: readonly {
+    fingerprints: EntityFingerprint<number>[];
+    store: IfcDataStore;
+    overlay?: PendingOverlay | null;
+}[], duplicates: ReadonlyMap<string, number[]>): void;
+/**
+ * Build the key resolver for one model: `prop:<value>` where the entity carries
+ * a non-empty value nobody else does, GlobalId otherwise. Duplicate values are
+ * reported on `options.duplicateAuthoredKeys`. Tombstoned entities are not
+ * owners: a deleted twin no longer contests the key. A created entity has no
+ * store row to read and keeps its GlobalId.
+ */
+export declare function authoredKeyResolver(store: IfcDataStore, overlay: PendingOverlay | null | undefined, options: FingerprintAdapterOptions, extractor: EntityExtractor, entities: readonly EffectiveEntity[]): (expressId: number, globalId: string) => string;
+/**
+ * One named attribute, read positionally through the **cross-schema** attribute
+ * list (issue #2021). The CLI's twin, and it must stay one.
+ *
+ * `extractAllEntityAttributes` names attributes through the parser's IFC4
+ * codegen pin, which answers an EMPTY list for a class the pin does not carry —
+ * so a `.find(name === 'Tag')` over it silently finds nothing on every
+ * IFC4X3-only type object (`IfcRailType`, `IfcTrackElementType`,
+ * `IfcSignalType`, …) while working perfectly on IFC2X3 and IFC4. That is a
+ * no-op nobody would notice: the entity is in scope, its class name is right,
+ * `isTypeObject` is right, and only the evidence is missing.
+ *
+ * This is the same pinned-registry family as the membership defect `#2001`
+ * fixed, and it has to be answered from the same place: the inheritance chain
+ * decides *whether* to read a `Tag`, so the attribute list that decides *where*
+ * it sits must span the same schemas. `getAttributeNamesAcrossSchemas` returns
+ * the pinned result unchanged for every class the pin does know, so this is
+ * additive — no IFC2X3 or IFC4 entity's hash moves because of it.
+ *
+ * Reads the raw STEP slot rather than reusing `extractAllEntityAttributes`'
+ * display normalization: this value is hashed, not shown, so `$` (absent) is
+ * the only case that needs interpreting and it arrives as null.
+ */
+export declare function attributeAcrossSchemas(store: IfcDataStore, expressId: number, ifcType: string, attributeName: string): string | undefined;
+/**
+ * An overlay override wins whenever one exists, including when it is empty —
+ * `entity_set_attribute` with `''` clears the attribute, and falling back to
+ * the stored value there would hash the edit away.
+ */
+export declare function override(edited: string | undefined, stored: string | undefined): string | undefined;
+//# sourceMappingURL=diff-authored-keys.d.ts.map

package/dist/tools/diff-authored-keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-authored-keys.d.ts","sourceRoot":"","sources":["../../src/tools/diff-authored-keys.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,EACL,eAAe,EAKf,KAAK,YAAY,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE9D,qFAAqF;AACrF,MAAM,WAAW,yBAAyB;IACxC,4EAA4E;IAC5E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC/C;AAED,0FAA0F;AAC1F,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAE3C;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,SAAS;IACd,YAAY,EAAE,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC,EAAE,EACH,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACxC,IAAI,CA8BN;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,SAAS,EAC1C,OAAO,EAAE,yBAAyB,EAClC,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,SAAS,eAAe,EAAE,GACnC,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAoDjD;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GACpB,MAAM,GAAG,SAAS,CAQpB;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGnG"}

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

@@ -0,0 +1,166 @@
+/* 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/. */
+/**
+ * Attribute reading for the MCP diff adapter, and authored keys (issue #4955): `key_from` keys the
+ * comparison on `Tag` or a `Pset.Prop` instead of GlobalId. Read through the
+ * session OVERLAY, like every other fingerprinted value, so a queued edit or
+ * tombstone is what the comparison sees. Split out of `diff-fingerprints.ts`
+ * 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:';
+/**
+ * A collision found on either revision invalidates that authored value on
+ * both. The first side may already have been built when the second reveals the
+ * collision, so repair its key back to the entity's GlobalId before diffing.
+ */
+export function fallbackPairDuplicateAuthoredKeys(sides, duplicates) {
+    if (duplicates.size === 0)
+        return;
+    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))
+                continue;
+            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;
+            // 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}`);
+            }
+            fingerprint.key = globalId;
+        }
+    }
+}
+/**
+ * Build the key resolver for one model: `prop:<value>` where the entity carries
+ * a non-empty value nobody else does, GlobalId otherwise. Duplicate values are
+ * reported on `options.duplicateAuthoredKeys`. Tombstoned entities are not
+ * 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, entities) {
+    const keySpec = options.keyProperty ? parseAuthoredKeySpec(options.keyProperty) : undefined;
+    if (!keySpec)
+        return (_expressId, globalId) => globalId;
+    const authoredKeyOf = (expressId) => {
+        if (keySpec.kind === 'tag') {
+            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);
+            const property = set?.properties.find((p) => p.name === keySpec.property);
+            if (set) {
+                const raw = property?.value;
+                if (raw === null || raw === undefined)
+                    return undefined;
+                const value = typeof raw === 'object' ? JSON.stringify(raw) : String(raw);
+                return value.trim().length > 0 ? value.trim() : undefined;
+            }
+        }
+        return authoredKeyValue(store, expressId, keySpec, extractor);
+    };
+    // 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();
+    const seen = new Set();
+    for (const { expressId } of entities) {
+        if (seen.has(expressId))
+            continue;
+        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)
+            options.duplicateAuthoredKeys?.set(value, ids);
+    }
+    return (expressId, globalId) => {
+        const value = authoredKeyOf(expressId);
+        if (value === undefined)
+            return globalId;
+        return (owners.get(value)?.length ?? 0) === 1 ? `${AUTHORED_KEY_PREFIX}${value}` : globalId;
+    };
+}
+/**
+ * One named attribute, read positionally through the **cross-schema** attribute
+ * list (issue #2021). The CLI's twin, and it must stay one.
+ *
+ * `extractAllEntityAttributes` names attributes through the parser's IFC4
+ * codegen pin, which answers an EMPTY list for a class the pin does not carry —
+ * so a `.find(name === 'Tag')` over it silently finds nothing on every
+ * IFC4X3-only type object (`IfcRailType`, `IfcTrackElementType`,
+ * `IfcSignalType`, …) while working perfectly on IFC2X3 and IFC4. That is a
+ * no-op nobody would notice: the entity is in scope, its class name is right,
+ * `isTypeObject` is right, and only the evidence is missing.
+ *
+ * This is the same pinned-registry family as the membership defect `#2001`
+ * fixed, and it has to be answered from the same place: the inheritance chain
+ * decides *whether* to read a `Tag`, so the attribute list that decides *where*
+ * it sits must span the same schemas. `getAttributeNamesAcrossSchemas` returns
+ * the pinned result unchanged for every class the pin does know, so this is
+ * additive — no IFC2X3 or IFC4 entity's hash moves because of it.
+ *
+ * Reads the raw STEP slot rather than reusing `extractAllEntityAttributes`'
+ * display normalization: this value is hashed, not shown, so `$` (absent) is
+ * the only case that needs interpreting and it arrives as null.
+ */
+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;
+    const raw = new EntityExtractor(store.source).extractEntity(ref)?.attributes?.[index];
+    return typeof raw === 'string' || typeof raw === 'number' ? String(raw) : undefined;
+}
+/**
+ * An overlay override wins whenever one exists, including when it is empty —
+ * `entity_set_attribute` with `''` clears the attribute, and falling back to
+ * the stored value there would hash the edit away.
+ */
+export function override(edited, stored) {
+    const value = edited !== undefined ? edited : stored;
+    return value ? value : undefined;
+}
+//# sourceMappingURL=diff-authored-keys.js.map

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

@@ -0,0 +1 @@
+{"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.d.ts

@@ -0,0 +1,33 @@
+import { type PendingOverlay } from '../overlay.js';
+import type { LoadedModel } from '../context.js';
+/** Default cap on the listed `contentMatches`. Per-kind totals are reported
+ *  whole, so the cap bounds the payload without hiding anything. */
+export declare const DEFAULT_MAX_MATCHES = 200;
+/**
+ * Default cap on the GlobalIds listed per side of one match.
+ *
+ * `max_matches` bounds how many groups come back, not how big one is, and a
+ * `duplicated` / `deduplicated` / `ambiguous` group is a set of candidates that
+ * in a repetitive model can run to thousands of entities on each side. Without
+ * this, `max_matches: 1` could still return a model-sized payload and overflow
+ * the context window the cap exists to protect.
+ *
+ * 20 is chosen against what the list is *for*. A group is the engine declining
+ * to guess, so its members are a hand-off to the caller; twenty candidates on a
+ * side is already past what anyone resolves by reading a list rather than by
+ * querying the two models. The overwhelmingly common match is a 1:1 `renamed`
+ * pair, which this never touches. Every group still reports `baseCount` and
+ * `headCount` whole, computed before the cap for the same reason
+ * `contentMatchCounts` is: truncation must never be what makes a model look
+ * cleanly matched.
+ */
+export declare const DEFAULT_MAX_GROUP_MEMBERS = 20;
+/** Run the real `@ifc-lite/diff` engine over two loaded models. See the
+ *  module doc for the scope and abstention contract. */
+export declare function contentDiff(left: LoadedModel, right: LoadedModel, overlays: {
+    left: PendingOverlay | null;
+    right: PendingOverlay | null;
+}, maxMatches: number, maxGroupMembers: number, keyProperty?: string, splitMerge?: boolean, successors?: boolean): Record<string, unknown>;
+/** One-line human summary of the engine result, for the text block. */
+export declare function describeCounts(content: Record<string, unknown>): string;
+//# sourceMappingURL=diff-content.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"diff-content.d.ts","sourceRoot":"","sources":["../../src/tools/diff-content.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD;oEACoE;AACpE,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAiB5C;wDACwD;AACxD,wBAAgB,WAAW,CACzB,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE;IAAE,IAAI,EAAE,cAAc,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAA;CAAE,EACvE,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,OAAO,GACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAwFzB;AAgBD,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAOvE"}

package/dist/tools/diff-content.js

@@ -0,0 +1,158 @@
+/* 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/. */
+/**
+ * `model_diff`'s `by_content` half: the real `@ifc-lite/diff` engine run over
+ * two loaded models (issue #1891), plus `split_merge` / `successors`
+ * (issue #4956). Split out of `diff.ts` for size.
+ *
+ * **Data scope only.** This server has no geometry pipeline, so there is no
+ * world geometry hash and no bounding box; `scope: 'data'` is the honest
+ * description of what it can see, and every unambiguous 1:1 content match is
+ * therefore reported as `renamed` rather than `moved`/`reshaped`. `split_merge`
+ * and `successors` are geometry-only stages: they are threaded through to
+ * `diffModels` so the params exist and cost nothing today, but on this server
+ * they currently produce no claims either way (`diff.splitMerges` /
+ * `diff.successors` stay `undefined`, the engine's abstention) — they start
+ * producing claims the moment this server gains a geometry pass, with no
+ * further plumbing change. See `diff-fingerprints.ts`.
+ */
+import { diffModels } from '@ifc-lite/diff';
+import { buildModelFingerprints } from './diff-fingerprints.js';
+import { fallbackPairDuplicateAuthoredKeys } from './diff-authored-keys.js';
+import { pendingMutationsField } from '../overlay.js';
+/** Default cap on the listed `contentMatches`. Per-kind totals are reported
+ *  whole, so the cap bounds the payload without hiding anything. */
+export const DEFAULT_MAX_MATCHES = 200;
+/**
+ * Default cap on the GlobalIds listed per side of one match.
+ *
+ * `max_matches` bounds how many groups come back, not how big one is, and a
+ * `duplicated` / `deduplicated` / `ambiguous` group is a set of candidates that
+ * in a repetitive model can run to thousands of entities on each side. Without
+ * this, `max_matches: 1` could still return a model-sized payload and overflow
+ * the context window the cap exists to protect.
+ *
+ * 20 is chosen against what the list is *for*. A group is the engine declining
+ * to guess, so its members are a hand-off to the caller; twenty candidates on a
+ * side is already past what anyone resolves by reading a list rather than by
+ * querying the two models. The overwhelmingly common match is a 1:1 `renamed`
+ * pair, which this never touches. Every group still reports `baseCount` and
+ * `headCount` whole, computed before the cap for the same reason
+ * `contentMatchCounts` is: truncation must never be what makes a model look
+ * cleanly matched.
+ */
+export const DEFAULT_MAX_GROUP_MEMBERS = 20;
+/**
+ * Kinds an agent has to resolve itself, listed before the ones the engine
+ * already retired. Truncating the list must never be what drops the
+ * "we could not tell" groups.
+ */
+const UNRESOLVED_FIRST = [
+    'ambiguous',
+    'duplicated',
+    'deduplicated',
+    'moved',
+    'reshaped',
+    'respecified',
+    'renamed',
+];
+/** Run the real `@ifc-lite/diff` engine over two loaded models. See the
+ *  module doc for the scope and abstention contract. */
+export function contentDiff(left, right, overlays, maxMatches, maxGroupMembers, keyProperty, splitMerge, successors) {
+    // Authored keys (issue #4955): `prop:<value>` where the model maintains one,
+    // GlobalId otherwise; a value two entities share is refused for both and
+    // reported so the agent sees why those two fell back.
+    const duplicateAuthoredKeys = new Map();
+    const adapter = { keyProperty, duplicateAuthoredKeys };
+    const baseFingerprints = buildModelFingerprints(left.store, overlays.left, adapter);
+    const headFingerprints = buildModelFingerprints(right.store, overlays.right, adapter);
+    fallbackPairDuplicateAuthoredKeys([
+        { fingerprints: baseFingerprints, store: left.store, overlay: overlays.left },
+        { fingerprints: headFingerprints, store: right.store, overlay: overlays.right },
+    ], duplicateAuthoredKeys);
+    const diff = diffModels(baseFingerprints, headFingerprints, {
+        scope: 'data',
+        matchUnpairedByContent: true,
+        detectSplitMerge: splitMerge,
+        detectSuccessors: successors,
+    });
+    const matches = [...(diff.contentMatches ?? [])].sort((a, b) => UNRESOLVED_FIRST.indexOf(a.kind) - UNRESOLVED_FIRST.indexOf(b.kind));
+    const byKind = {};
+    for (const match of matches)
+        byKind[match.kind] = (byKind[match.kind] ?? 0) + 1;
+    return {
+        scope: diff.scope,
+        keyProperty: keyProperty ?? null,
+        duplicateAuthoredKeys: [...duplicateAuthoredKeys.keys()].sort(),
+        counts: diff.counts,
+        // Whole totals, computed before the cap: an agent reading `contentMatches`
+        // can always tell whether the list it got is the whole story.
+        contentMatchCounts: byKind,
+        contentMatches: matches.slice(0, maxMatches).map((match) => ({
+            kind: match.kind,
+            ifcType: match.base[0]?.ifcType ?? match.head[0]?.ifcType,
+            // Groups are reported as groups. Collapsing a `duplicated` or
+            // `ambiguous` set to a single pair would be the engine guessing, which
+            // is exactly what it refuses to do (#1923). Long groups are cut to
+            // `maxGroupMembers` per side and say so, whole size included, so a cut
+            // group still reads as a group of that size.
+            ...listSide('base', match.base, maxGroupMembers),
+            ...listSide('head', match.head, maxGroupMembers),
+            ...(match.distance !== undefined ? { distance: match.distance } : {}),
+        })),
+        truncatedMatches: Math.max(0, matches.length - maxMatches),
+        // Absent (not `[]`) exactly when the stage did not run, or ran and the
+        // geometry abstention fired — this server's current state, always, until
+        // it has a geometry pipeline. The engine's "absent means not proved"
+        // contract, preserved rather than flattened.
+        splitMerges: diff.splitMerges?.map((claim) => ({
+            kind: claim.kind,
+            confidence: claim.confidence,
+            whole: claim.whole.key,
+            pieces: claim.pieces.map((piece) => piece.key),
+        })),
+        successors: diff.successors?.map((claim) => ({
+            confidence: claim.confidence,
+            base: claim.base.key,
+            head: claim.head.key,
+            overlap: claim.overlap,
+            distance: claim.distance,
+        })),
+        // Uncommitted edits are folded into the comparison; saying how many there
+        // are is what separates "the two files differ" from "this session has
+        // edits it has not written yet". Absent when neither model has any.
+        //
+        // `pendingMutations` is the scalar every other payload carries; the split a
+        // two-model comparison can additionally give lives under its own name rather
+        // than overloading that one.
+        ...pendingMutationsField(overlays.left, overlays.right),
+        ...(overlays.left || overlays.right
+            ? {
+                pendingMutationsBySide: {
+                    base: overlays.left?.pendingMutations ?? 0,
+                    head: overlays.right?.pendingMutations ?? 0,
+                },
+            }
+            : {}),
+    };
+}
+/** One side of a match: the (capped) keys, the whole count, and whether the
+ *  list was cut. Emits `base`/`baseCount`/`baseTruncated` (or `head…`). */
+function listSide(side, entities, maxGroupMembers) {
+    return {
+        [side]: entities.slice(0, maxGroupMembers).map((entity) => entity.key),
+        [`${side}Count`]: entities.length,
+        [`${side}Truncated`]: entities.length > maxGroupMembers,
+    };
+}
+/** One-line human summary of the engine result, for the text block. */
+export function describeCounts(content) {
+    const counts = content.counts;
+    const byKind = content.contentMatchCounts;
+    const kinds = Object.entries(byKind).map(([kind, n]) => `${n} ${kind}`).join(', ');
+    return `${counts.added} added, ${counts.modified} modified, ${counts.deleted} deleted, `
+        + `${counts.unchanged} unchanged`
+        + (kinds ? `; content matches: ${kinds}` : '; no content matches');
+}
+//# sourceMappingURL=diff-content.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -84,7 +84,9 @@
  */
 import { type EntityFingerprint } from '@ifc-lite/diff';
 import { type IfcDataStore } from '@ifc-lite/parser';
-import type { PendingOverlay } from '../overlay.js';
+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';
 /** Adapter handle threaded through the diff: the entity's express id. */
 export type DiffRef = number;
 /**
@@ -102,5 +104,5 @@ export type DiffRef = number;
  * values. Omitting it (the CLI twin has no session to overlay) is the original
  * store-only behaviour exactly.
  */
-export declare function buildModelFingerprints(store: IfcDataStore, overlay?: PendingOverlay | null): EntityFingerprint<DiffRef>[];
+export declare function buildModelFingerprints(store: IfcDataStore, overlay?: PendingOverlay | null, options?: FingerprintAdapterOptions): EntityFingerprint<DiffRef>[];
 //# sourceMappingURL=diff-fingerprints.d.ts.map