@ifc-lite/cli 0.33.1 → 0.36.1

package/dist/commands/diff-content-report.js

@@ -0,0 +1,67 @@
+/* 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/. */
+export function printReport(report) {
+    const { diff } = report;
+    const out = (line) => {
+        process.stdout.write(`${line}\n`);
+    };
+    out('');
+    out(`  Base: ${report.basePath}`);
+    out(`  Head: ${report.headPath}`);
+    out(`  Scope: ${diff.scope}` +
+        (diff.scope === 'data' ? ' (pass --geometry for world geometry hashes + boxes)' : ''));
+    if (report.keyProperty)
+        out(`  Key:   ${report.keyProperty} (GlobalId where absent)`);
+    out('');
+    out(`  Unchanged: ${diff.counts.unchanged}`);
+    out(`  Modified:  ${diff.counts.modified}`);
+    out(`  Added:     ${diff.counts.added}`);
+    out(`  Deleted:   ${diff.counts.deleted}`);
+    const byKind = new Map();
+    for (const match of diff.contentMatches ?? []) {
+        byKind.set(match.kind, (byKind.get(match.kind) ?? 0) + 1);
+    }
+    out('');
+    if (byKind.size === 0) {
+        out('  Content matches: none');
+    }
+    else {
+        out('  Content matches:');
+        for (const [kind, count] of [...byKind].sort()) {
+            out(`    ${kind.padEnd(13)} ${count}`);
+        }
+        out('    (renamed / moved / reshaped / respecified are resolved; the rest need a human)');
+    }
+    if (diff.splitMerges) {
+        out('');
+        out(diff.splitMerges.length === 0
+            ? '  Split/merge claims: none'
+            : `  Split/merge claims: ${diff.splitMerges.length}`);
+    }
+    if (diff.successors) {
+        out('');
+        out(diff.successors.length === 0
+            ? '  Successor claims: none'
+            : `  Successor claims: ${diff.successors.length} (suggestions — review before accepting)`);
+    }
+    if (report.identityIn) {
+        out('');
+        out(`  Identity map in:  ${report.identityIn}`);
+        out(`    applied: ${report.appliedCount}, ignored: ${report.ignoredCount}`);
+    }
+    if (report.written) {
+        out('');
+        out(`  Identity map out: ${report.written.path} (${report.written.entries.length} claims)`);
+    }
+    if (report.lineageIn) {
+        out('');
+        out(`  Lineage in:  ${report.lineageIn}`);
+    }
+    if (report.lineageWritten) {
+        out('');
+        out(`  Lineage out: ${report.lineageWritten.path} (${report.lineageWritten.entries.length} entries)`);
+    }
+    out('');
+}
+//# sourceMappingURL=diff-content-report.js.map

package/dist/commands/diff-content-report.js.map

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

package/dist/commands/diff-content.d.ts

@@ -5,6 +5,25 @@ export interface ContentDiffOptions {
     identityIn?: string;
     /** `--identity-out`: where to write the sidecar this run establishes. */
     identityOut?: string;
+    /** `--lineage-in`: a lineage whose 1:1 entries are replayed as key aliases. */
+    lineageIn?: string;
+    /** `--lineage-out`: where to write the lineage this run establishes. */
+    lineageOut?: string;
+    /** `--accept`: a reviewed identity map folded into the lineage as `replaced`. */
+    accept?: string;
+    /** `--key-from`: `Tag` or `Pset.Prop`, the authored key to compare on. */
+    keyFrom?: string;
+    /** `--geometry`: run the wasm mesh pass and attach world geometry hashes,
+     *  boxes and volumes, promoting the comparison from `data` to `both`
+     *  scope (issue #4956). Skips with a stderr warning, not a fatal error,
+     *  when the wasm runtime is not built on this host. */
+    geometry?: boolean;
+    /** `--split-merge`: opt in to the split/merge detector. Only produces
+     *  claims together with `--geometry` (issue #4956). */
+    splitMerge?: boolean;
+    /** `--successors`: opt in to the successor-match detector. Only produces
+     *  claims together with `--geometry` (issue #4956). */
+    successors?: boolean;
     json: boolean;
 }
 export declare function contentDiffCommand(options: ContentDiffOptions): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"diff-content.d.ts","sourceRoot":"","sources":["../../src/commands/diff-content.ts"],"names":[],"mappings":"AAmCA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFnF"}
+{"version":3,"file":"diff-content.d.ts","sourceRoot":"","sources":["../../src/commands/diff-content.ts"],"names":[],"mappings":"AA6DA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;2DAGuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;2DACuD;IACvD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;2DACuD;IACvD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8LnF"}

package/dist/commands/diff-content.js

@@ -8,37 +8,99 @@
  * The loop this closes: run it once, review the `renamed` matches, keep the
  * sidecar. On the next run the accepted claims come back in as key aliases, the
  * re-GUIDed elements are matched by key, and they never show up as churn again.
- * See `diff-engine.ts` for why this path is data-scope only.
+ * Data scope by default — see `diff-engine.ts`; `--geometry` below opts into
+ * the wasm mesh pass.
+ *
+ * Issue #4955 adds three things on the same loop: `--key-from` keys the
+ * comparison on an authored identifier instead of GlobalId; `--lineage-out` /
+ * `--lineage-in` write and replay the 1:k lineage an external table rekeys on;
+ * and `--accept` folds a reviewed identity map (a human's answer to the
+ * suggestions a geometry-capable run produced) into that lineage as
+ * `replaced` entries.
+ *
+ * Issue #4956 adds `--geometry`: a lazily-loaded `@ifc-lite/wasm` mesh pass
+ * (`diff-geometry.ts`) that attaches world geometry hashes, bounding boxes and
+ * volumes to both files' fingerprints, promoting the scope from `data` to
+ * `both`. `--split-merge` / `--successors` turn on the two geometry-only
+ * detection stages; both are no-ops without `--geometry` (the engine abstains
+ * exactly as it does for a viewer session whose geometry hashing failed).
  */
-import { readFile, stat, writeFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
-import { createIdentityMapSidecar, diffModels, identityMapFromContentMatches, identityMapSidecarMismatches, keyAliasesFromSidecar, parseIdentityMapSidecar, serializeIdentityMapSidecar, } from '@ifc-lite/diff';
+import { readFile, writeFile } from 'node:fs/promises';
+import { createIdentityMapSidecar, createLineageSidecar, diffModels, identityMapFromContentMatches, identityMapSidecarMismatches, keyAliasesFromLineage, keyAliasesFromSidecar, parseIdentityMapSidecar, serializeIdentityMapSidecar, serializeLineageSidecar, } from '@ifc-lite/diff';
+import { parseAuthoredKeySpec } from '@ifc-lite/parser';
 import { loadIfcBytes } from '../loader.js';
 import { fatal, printJson } from '../output.js';
-import { buildFileFingerprints, modelIdentityOf } from './diff-engine.js';
+import { buildFileFingerprints, fallbackPairDuplicateAuthoredKeys, modelIdentityOf, } from './diff-engine.js';
+import { readModel, refuseOverwritingAnInput, unwrapModel } from './diff-content-io.js';
+import { resolveGeometryScope } from './diff-geometry.js';
+import { mergeAliases, mergeLineage, readVerifiedLineage } from './diff-lineage-io.js';
+import { printReport } from './diff-content-report.js';
 export async function contentDiffCommand(options) {
     const { basePath, headPath } = options;
+    const keySpec = options.keyFrom === undefined ? undefined : parseAuthoredKeySpec(options.keyFrom);
+    if (options.keyFrom !== undefined && !keySpec) {
+        fatal(`--key-from must be Tag or <PsetName>.<PropertyName>, got "${options.keyFrom}"`);
+    }
+    // `Tag` is case-insensitive at the CLI boundary, but the persisted sidecar
+    // contract is canonical and shared with the viewer's compare UI.
+    const keyProperty = keySpec?.kind === 'tag' ? 'Tag' : options.keyFrom?.trim();
     // Before anything is read, and long before anything is written.
     await refuseOverwritingAnInput(options);
     const baseBytes = await readModel(basePath);
     const headBytes = await readModel(headPath);
+    // The identity hash is over the file AS IT SITS ON DISK, before any
+    // `.ifcZIP` unwrapping (see `modelIdentityOf`) — so it is taken from the raw
+    // bytes, and the unwrap below is a separate step, not folded into this read.
     const baseIdentity = modelIdentityOf(basePath, baseBytes);
     const headIdentity = modelIdentityOf(headPath, headBytes);
+    const pinned = { base: baseIdentity, head: headIdentity, keyProperty };
     const incoming = options.identityIn
-        ? await readVerifiedSidecar(options.identityIn, baseIdentity, headIdentity)
+        ? await readVerifiedSidecar(options.identityIn, pinned)
         : undefined;
+    const incomingLineage = options.lineageIn
+        ? await readVerifiedLineage(options.lineageIn, pinned)
+        : undefined;
+    const accepted = options.accept ? await readVerifiedSidecar(options.accept, pinned) : undefined;
+    // Unwrapped ONCE and reused by both the parser and (if `--geometry` runs)
+    // the wasm mesh pass — `unwrapIfcZipView` is a cheap magic-byte no-op for an
+    // ordinary `.ifc` file, so a `--geometry` run over a `.ifcZIP` still sees the
+    // real STEP bytes rather than the zip container (issue #4956 review).
+    const baseUnwrapped = await unwrapModel(baseBytes, basePath);
+    const headUnwrapped = await unwrapModel(headBytes, headPath);
     process.stderr.write('Loading files...\n');
-    const baseStore = await loadIfcBytes(baseBytes, basePath);
-    const headStore = await loadIfcBytes(headBytes, headPath);
-    const diff = diffModels(buildFileFingerprints(baseStore), buildFileFingerprints(headStore), {
-        // No meshes in Node: `data` is the honest description of what this path can
-        // compare. See diff-engine.ts.
-        scope: 'data',
+    const baseStore = await loadIfcBytes(baseUnwrapped, basePath);
+    const headStore = await loadIfcBytes(headUnwrapped, headPath);
+    const duplicateAuthoredKeys = new Map();
+    const adapter = { keyProperty, duplicateAuthoredKeys };
+    const baseFingerprints = buildFileFingerprints(baseStore, adapter);
+    const headFingerprints = buildFileFingerprints(headStore, adapter);
+    fallbackPairDuplicateAuthoredKeys([
+        { fingerprints: baseFingerprints, store: baseStore },
+        { fingerprints: headFingerprints, store: headStore },
+    ], duplicateAuthoredKeys);
+    for (const [value, ids] of duplicateAuthoredKeys) {
+        process.stderr.write(`Warning: ${keyProperty} = "${value}" names ${ids.length} entities; they fall back to GlobalId.\n`);
+    }
+    // Both sources of aliases are replayed together. A lineage's 1:1 entries and
+    // an identity map's claims are the same kind of thing under two file formats;
+    // where the two disagree about one head key, neither is applied — that is
+    // `resolveKeyAliases` rule 4, arriving from two files instead of one.
+    const aliases = mergeAliases(incoming ? keyAliasesFromSidecar(incoming) : undefined, incomingLineage ? keyAliasesFromLineage(incomingLineage.entries) : undefined);
+    // `--geometry` (issue #4956): see `diff-geometry.ts` for the wasm pass and
+    // the graceful fall-back to `scope: 'data'` when the runtime is absent.
+    const scope = await resolveGeometryScope(options.geometry ?? false, baseUnwrapped, headUnwrapped, baseFingerprints, headFingerprints, (message) => process.stderr.write(`Warning: ${message}\n`));
+    const diff = diffModels(baseFingerprints, headFingerprints, {
+        scope,
         matchUnpairedByContent: true,
-        keyAliases: incoming ? keyAliasesFromSidecar(incoming) : undefined,
+        keyAliases: aliases,
+        // Both are geometry-only stages (issue #4956): with no geometry pass run,
+        // the engine abstains and `diff.splitMerges` / `diff.successors` stay
+        // undefined, exactly as a viewer session with failed geometry hashing.
+        detectSplitMerge: options.splitMerge,
+        detectSuccessors: options.successors,
     });
     const applied = diff.appliedKeyAliases ?? new Map();
-    const ignored = incoming ? countClaims(incoming) - applied.size : 0;
+    const ignored = aliases ? aliases.size - applied.size : 0;
     let written;
     if (options.identityOut) {
         const entries = mergeIdentityClaims(incoming, applied, diff.contentMatches);
@@ -59,10 +121,25 @@ export async function contentDiffCommand(options) {
             // optional, and `git log` dates a reviewed, committed artifact better
             // than a self-reported timestamp does.
             created: incoming?.created,
+            keyProperty,
         });
         await writeFile(options.identityOut, serializeIdentityMapSidecar(sidecar), 'utf-8');
         written = { path: options.identityOut, entries: sidecar.entries };
     }
+    let lineageWritten;
+    if (options.lineageOut) {
+        const { entries, deleted } = mergeLineage(incomingLineage, incoming, diff, accepted);
+        const sidecar = createLineageSidecar({
+            base: baseIdentity,
+            head: headIdentity,
+            entries,
+            deleted,
+            created: incomingLineage?.created,
+            keyProperty,
+        });
+        await writeFile(options.lineageOut, serializeLineageSidecar(sidecar), 'utf-8');
+        lineageWritten = { path: options.lineageOut, entries: sidecar.entries };
+    }
     if (options.json) {
         printJson({
             base: { path: basePath, hash: baseIdentity.hash, schema: baseStore.schemaVersion },
@@ -74,12 +151,36 @@ export async function contentDiffCommand(options) {
                 base: match.base.map((entity) => entity.key),
                 head: match.head.map((entity) => entity.key),
             })),
+            // Absent (not `[]`) exactly when the stage did not run or the geometry
+            // abstention fired — the engine's own "absent means not proved"
+            // contract, preserved rather than flattened to an empty array.
+            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,
+            })),
             identityMap: {
                 in: options.identityIn
                     ? { path: options.identityIn, applied: applied.size, ignored }
                     : undefined,
                 out: written ? { path: written.path, entries: written.entries.length } : undefined,
             },
+            lineage: {
+                in: options.lineageIn ? { path: options.lineageIn } : undefined,
+                out: lineageWritten
+                    ? { path: lineageWritten.path, entries: lineageWritten.entries.length }
+                    : undefined,
+            },
+            keyProperty: keyProperty ?? null,
+            duplicateAuthoredKeys: [...duplicateAuthoredKeys.keys()],
         });
         return;
     }
@@ -91,75 +192,11 @@ export async function contentDiffCommand(options) {
         ignoredCount: ignored,
         identityIn: options.identityIn,
         written,
+        lineageIn: options.lineageIn,
+        lineageWritten,
+        keyProperty,
     });
 }
-/**
- * Refuse to run at all if `--identity-out` names one of the two input models.
- *
- * The sidecar is a JSON document. Writing it over an IFC file destroys the
- * user's model, and a mistyped or shell-completed path is all it takes — the
- * two arguments right before it are IFC paths. So this is checked first, and
- * the command exits without reading, comparing, or writing anything.
- *
- * Two independent tests, because a path string is not a file:
- *
- * 1. Resolved paths are equal. Catches `./v1.ifc` vs `v1.ifc` vs `sub/../v1.ifc`
- *    with no filesystem access, and is the whole answer on a platform where
- *    `stat` reports no usable inode.
- * 2. The output already exists AND is the same file as an input, by device +
- *    inode. This is the exhaustive test: it catches a symlink, a hard link, a
- *    bind mount, and `V1.IFC` on a case-insensitive filesystem — every way two
- *    different strings can name one file. It is also sufficient on its own for
- *    the destructive case, because a path that does not resolve to an existing
- *    file cannot be overwriting an input: the inputs must exist to be read.
- *
- * `--identity-in` and `--identity-out` naming the SAME sidecar is not checked
- * here, because that is the carry-forward workflow this feature is built around
- * (read the accepted claims, write back the ones that still held).
- */
-async function refuseOverwritingAnInput(options) {
-    const { identityOut } = options;
-    if (identityOut === undefined)
-        return;
-    const out = resolve(identityOut);
-    const outStat = await statOrUndefined(identityOut);
-    for (const [label, input] of [
-        ['base model', options.basePath],
-        ['head model', options.headPath],
-    ]) {
-        if (resolve(input) !== out && !isSameFile(outStat, await statOrUndefined(input)))
-            continue;
-        fatal(`--identity-out ${identityOut} is the ${label} (${input}). ` +
-            'Writing the identity map there would overwrite the input file.');
-    }
-}
-async function statOrUndefined(path) {
-    // A missing or unreadable path cannot be an input file being overwritten;
-    // reading the models is what reports it, with its own message.
-    try {
-        return await stat(path);
-    }
-    catch {
-        return undefined;
-    }
-}
-function isSameFile(a, b) {
-    return a !== undefined && b !== undefined && a.dev === b.dev && a.ino === b.ino;
-}
-/**
- * Read one of the two input models, reporting a missing or unreadable path the
- * way the rest of the command reports problems rather than throwing a raw
- * `ENOENT` stack at the user — the same treatment `readVerifiedSidecar` already
- * gives the sidecar.
- */
-async function readModel(path) {
-    try {
-        return await readFile(path);
-    }
-    catch (error) {
-        return fatal(`Cannot read ${path}: ${error.message}`);
-    }
-}
 /**
  * Read a sidecar and refuse it unless it was verified against exactly these two
  * files.
@@ -171,7 +208,7 @@ async function readModel(path) {
  * deliberately no override flag: the fix for a mismatch is to re-run the
  * comparison that produced the claims, which is one command.
  */
-async function readVerifiedSidecar(path, base, head) {
+async function readVerifiedSidecar(path, models) {
     let text;
     try {
         text = await readFile(path, 'utf-8');
@@ -186,18 +223,12 @@ async function readVerifiedSidecar(path, base, head) {
     catch (error) {
         return fatal(error.message);
     }
-    const problems = identityMapSidecarMismatches(sidecar, { base, head });
+    const problems = identityMapSidecarMismatches(sidecar, models);
     if (problems.length > 0) {
         return fatal(`Identity map ${path} was not verified against these files:\n  ${problems.join('\n  ')}`);
     }
     return sidecar;
 }
-/** Distinct head keys a sidecar actually claims (self-claims and repeats are
- *  no-ops the consumer drops, so counting raw entries would overstate what
- *  could have applied). */
-function countClaims(sidecar) {
-    return keyAliasesFromSidecar(sidecar).size;
-}
 /**
  * The claims the output sidecar should carry: the incoming ones that still
  * applied, plus the ones this run's content matching established.
@@ -227,44 +258,4 @@ function mergeIdentityClaims(incoming, applied, matches) {
     entries.push(...identityMapFromContentMatches(matches));
     return entries;
 }
-function printReport(report) {
-    const { diff } = report;
-    const out = (line) => {
-        process.stdout.write(`${line}\n`);
-    };
-    out('');
-    out(`  Base: ${report.basePath}`);
-    out(`  Head: ${report.headPath}`);
-    out(`  Scope: data (the CLI has no geometry pipeline)`);
-    out('');
-    out(`  Unchanged: ${diff.counts.unchanged}`);
-    out(`  Modified:  ${diff.counts.modified}`);
-    out(`  Added:     ${diff.counts.added}`);
-    out(`  Deleted:   ${diff.counts.deleted}`);
-    const byKind = new Map();
-    for (const match of diff.contentMatches ?? []) {
-        byKind.set(match.kind, (byKind.get(match.kind) ?? 0) + 1);
-    }
-    out('');
-    if (byKind.size === 0) {
-        out('  Content matches: none');
-    }
-    else {
-        out('  Content matches:');
-        for (const [kind, count] of [...byKind].sort()) {
-            out(`    ${kind.padEnd(13)} ${count}`);
-        }
-        out('    (renamed / moved / reshaped are resolved; the rest need a human)');
-    }
-    if (report.identityIn) {
-        out('');
-        out(`  Identity map in:  ${report.identityIn}`);
-        out(`    applied: ${report.appliedCount}, ignored: ${report.ignoredCount}`);
-    }
-    if (report.written) {
-        out('');
-        out(`  Identity map out: ${report.written.path} (${report.written.entries.length} claims)`);
-    }
-    out('');
-}
 //# sourceMappingURL=diff-content.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"diff-content.js","sourceRoot":"","sources":["../../src/commands/diff-content.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diff-content.js","sourceRoot":"","sources":["../../src/commands/diff-content.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,UAAU,EACV,6BAA6B,EAC7B,4BAA4B,EAC5B,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,uBAAuB,GAMxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EACL,qBAAqB,EACrB,iCAAiC,EACjC,eAAe,GAEhB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AA+BvD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA2B;IAClE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACvC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClG,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,EAAE,CAAC;QAC9C,KAAK,CAAC,6DAA6D,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC;IACzF,CAAC;IACD,2EAA2E;IAC3E,iEAAiE;IACjE,MAAM,WAAW,GAAG,OAAO,EAAE,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;IAE9E,gEAAgE;IAChE,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC5C,oEAAoE;IACpE,6EAA6E;IAC7E,6EAA6E;IAC7E,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,eAAe,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAE1D,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;IACvE,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU;QACjC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC;QACvD,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS;QACvC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;QACtD,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAEhG,0EAA0E;IAC1E,6EAA6E;IAC7E,8EAA8E;IAC9E,sEAAsE;IACtE,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC7D,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAE7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAE9D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC1D,MAAM,OAAO,GAAG,EAAE,WAAW,EAAE,qBAAqB,EAAE,CAAC;IACvD,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnE,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnE,iCAAiC,CAC/B;QACE,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE;QACpD,EAAE,YAAY,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE;KACrD,EACD,qBAAqB,CACtB,CAAC;IACF,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,qBAAqB,EAAE,CAAC;QACjD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY,WAAW,OAAO,KAAK,WAAW,GAAG,CAAC,MAAM,0CAA0C,CACnG,CAAC;IACJ,CAAC;IAED,6EAA6E;IAC7E,8EAA8E;IAC9E,0EAA0E;IAC1E,sEAAsE;IACtE,MAAM,OAAO,GAAG,YAAY,CAC1B,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,EACtD,eAAe,CAAC,CAAC,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAC7E,CAAC;IAEF,2EAA2E;IAC3E,wEAAwE;IACxE,MAAM,KAAK,GAAG,MAAM,oBAAoB,CACtC,OAAO,CAAC,QAAQ,IAAI,KAAK,EACzB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,OAAO,IAAI,CAAC,CAC3D,CAAC;IAEF,MAAM,IAAI,GAAG,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,EAAE;QAC1D,KAAK;QACL,sBAAsB,EAAE,IAAI;QAC5B,UAAU,EAAE,OAAO;QACnB,0EAA0E;QAC1E,sEAAsE;QACtE,uEAAuE;QACvE,gBAAgB,EAAE,OAAO,CAAC,UAAU;QACpC,gBAAgB,EAAE,OAAO,CAAC,UAAU;KACrC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,IAAI,IAAI,GAAG,EAAkB,CAAC;IACpE,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1D,IAAI,OAAkE,CAAC;IACvE,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,wBAAwB,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,YAAY;YAClB,OAAO;YACP,wEAAwE;YACxE,0EAA0E;YAC1E,sEAAsE;YACtE,qDAAqD;YACrD,0EAA0E;YAC1E,oEAAoE;YACpE,wEAAwE;YACxE,0EAA0E;YAC1E,sEAAsE;YACtE,wEAAwE;YACxE,sEAAsE;YACtE,uCAAuC;YACvC,OAAO,EAAE,QAAQ,EAAE,OAAO;YAC1B,WAAW;SACZ,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,2BAA2B,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QACpF,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IACpE,CAAC;IAED,IAAI,cAAqE,CAAC;IAC1E,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QACrF,MAAM,OAAO,GAAG,oBAAoB,CAAC;YACnC,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,YAAY;YAClB,OAAO;YACP,OAAO;YACP,OAAO,EAAE,eAAe,EAAE,OAAO;YACjC,WAAW;SACZ,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,uBAAuB,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/E,cAAc,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;IAC1E,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,SAAS,CAAC;YACR,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,aAAa,EAAE;YAClF,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,aAAa,EAAE;YAClF,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC1D,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;gBAC5C,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC;aAC7C,CAAC,CAAC;YACH,uEAAuE;YACvE,gEAAgE;YAChE,+DAA+D;YAC/D,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC7C,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG;gBACtB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;aAC/C,CAAC,CAAC;YACH,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBAC3C,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,CAAC,CAAC;YACH,WAAW,EAAE;gBACX,EAAE,EAAE,OAAO,CAAC,UAAU;oBACpB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE;oBAC9D,CAAC,CAAC,SAAS;gBACb,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS;aACnF;YACD,OAAO,EAAE;gBACP,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;gBAC/D,GAAG,EAAE,cAAc;oBACjB,CAAC,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE;oBACvE,CAAC,CAAC,SAAS;aACd;YACD,WAAW,EAAE,WAAW,IAAI,IAAI;YAChC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAC;SACzD,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,WAAW,CAAC;QACV,QAAQ;QACR,QAAQ;QACR,IAAI;QACJ,YAAY,EAAE,OAAO,CAAC,IAAI;QAC1B,YAAY,EAAE,OAAO;QACrB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,OAAO;QACP,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,cAAc;QACd,WAAW;KACZ,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,mBAAmB,CAChC,IAAY,EACZ,MAA0E;IAE1E,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAC,4BAA4B,IAAI,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;IAChF,CAAC;IACD,IAAI,OAA2B,CAAC;IAChC,IAAI,CAAC;QACH,OAAO,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IACD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CACV,gBAAgB,IAAI,6CAA6C,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACzF,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,mBAAmB,CAC1B,QAAwC,EACxC,OAAoC,EACpC,OAAqD;IAErD,MAAM,OAAO,GAAuB,EAAE,CAAC;IACvC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1C,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACtE,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,OAAO,EAAE,CAAC;YACnC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/commands/diff-engine.d.ts

@@ -19,5 +19,36 @@ export declare function modelIdentityOf(path: string, bytes: Uint8Array): ModelI
  * check is inert unless both sides supply them (see the "Hash collisions"
  * section of `docs/guide/model-diff.md`).
  */
-export declare function buildFileFingerprints(store: IfcDataStore): EntityFingerprint<DiffRef>[];
+/** Adapter options shared by the CLI and MCP fingerprint builders (issue #4955). */
+export interface FingerprintAdapterOptions {
+    /**
+     * An authored key to use as the cross-revision identity instead of GlobalId:
+     * `Tag`, or `<PsetName>.<PropertyName>`. An entity carrying a non-empty value
+     * is keyed `prop:<value>`; one without falls back to its GlobalId. Two
+     * entities sharing one authored value collapse under the diff's first-wins
+     * key index, so they are reported on `duplicateAuthoredKeys` and fall back
+     * to GlobalId too — a key that names two things is not a key.
+     */
+    keyProperty?: string;
+    /** Receives every authored value more than one entity carried. */
+    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:";
+/**
+ * Resolve every entity's key under an authored-key spec: `prop:<value>` where
+ * the value is present and unique, GlobalId otherwise. Duplicates are reported
+ * to the caller rather than silently collapsed by `indexByKey`.
+ */
+export declare function resolveAuthoredKeys(store: IfcDataStore, entities: readonly {
+    expressId: number;
+    globalId: string;
+}[], options: FingerprintAdapterOptions): Map<number, string>;
+export declare function buildFileFingerprints(store: IfcDataStore, options?: FingerprintAdapterOptions): EntityFingerprint<DiffRef>[];
+/** A collision discovered in either file invalidates that authored value in
+ * both files, including fingerprints already built for the first side. */
+export declare function fallbackPairDuplicateAuthoredKeys(sides: readonly {
+    fingerprints: EntityFingerprint<DiffRef>[];
+    store: IfcDataStore;
+}[], duplicates: ReadonlyMap<string, number[]>): void;
 //# sourceMappingURL=diff-engine.d.ts.map

package/dist/commands/diff-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff-engine.d.ts","sourceRoot":"","sources":["../../src/commands/diff-engine.ts"],"names":[],"mappings":"AA8BA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EACnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAWL,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAI1B,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,aAAa,CAG9E;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAsBvF"}
+{"version":3,"file":"diff-engine.d.ts","sourceRoot":"","sources":["../../src/commands/diff-engine.ts"],"names":[],"mappings":"AA8BA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EACnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAcL,KAAK,YAAY,EAElB,MAAM,kBAAkB,CAAC;AAI1B,yEAAyE;AACzE,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,aAAa,CAG9E;AAED;;;;;;;;GAQG;AACH,oFAAoF;AACpF,MAAM,WAAW,yBAAyB;IACxC;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,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,mBAAmB,CACjC,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,SAAS;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,EAC5D,OAAO,EAAE,yBAAyB,GACjC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAyBrB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,OAAO,GAAE,yBAA8B,GACtC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CA8B9B;AAED;0EAC0E;AAC1E,wBAAgB,iCAAiC,CAC/C,KAAK,EAAE,SAAS;IACd,YAAY,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3C,KAAK,EAAE,YAAY,CAAC;CACrB,EAAE,EACH,UAAU,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GACxC,IAAI,CAiBN"}