@ifc-lite/merge 0.1.0

package/dist/merge-layer.js

@@ -0,0 +1,179 @@
+/* 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/. */
+import { IFCLITE_ATTR, computeLayerId, createProvenanceManifest, setProvenance } from '@ifc-lite/ifcx';
+import { opsForComponentChange } from './three-way.js';
+function resolutionKey(path, componentKey) {
+    return componentKey === undefined ? path : `${path}\u0000${componentKey}`;
+}
+/**
+ * Turn reviewer decisions into ops. `ours` keeps the target state (no op),
+ * `theirs` adopts the candidate value, `edited` takes the supplied
+ * replacement component value (component-scoped conflicts only).
+ */
+export function applyResolutions(plan, inputs) {
+    const byKey = new Map();
+    for (const input of inputs) {
+        byKey.set(resolutionKey(input.path, input.componentKey), input);
+    }
+    const ops = [];
+    const resolutions = [];
+    const unresolved = [];
+    for (const conflict of plan.conflicts) {
+        const input = byKey.get(resolutionKey(conflict.path, conflict.componentKey));
+        if (!input) {
+            unresolved.push(conflict);
+            continue;
+        }
+        const record = { entity: conflict.path, choice: input.choice };
+        if (conflict.componentKey !== undefined)
+            record.componentKey = conflict.componentKey;
+        resolutions.push(record);
+        if (input.choice === 'ours')
+            continue;
+        if (input.choice === 'edited') {
+            if (conflict.componentKey === undefined || input.attributes === undefined) {
+                throw new Error(`edited resolution for ${conflict.path} requires a componentKey-scoped conflict and replacement attributes`);
+            }
+            if (conflict.componentKey.startsWith('child:') || conflict.componentKey.startsWith('inherit:')) {
+                // A set-component on a relation pseudo-component would serialize
+                // as a literal attribute instead of a children/inherits edge.
+                throw new Error(`edited resolution cannot target relation component ${conflict.componentKey} on ${conflict.path}; resolve ours/theirs instead`);
+            }
+            ops.push({
+                op: 'set-component',
+                path: conflict.path,
+                componentKey: conflict.componentKey,
+                attributes: input.attributes,
+            });
+            continue;
+        }
+        // choice === 'theirs'
+        ops.push(...opsForTheirs(conflict));
+    }
+    return { ops, resolutions, unresolved };
+}
+function opsForTheirs(conflict) {
+    if (conflict.componentKey !== undefined) {
+        return opsForComponentChange(conflict.path, conflict.componentKey, conflict.base?.attributes, conflict.theirs?.attributes, 
+        // Attribute keys ours added inside this component must be nulled,
+        // or they survive a "theirs" resolution via per-attribute LWW.
+        conflict.ours?.attributes);
+    }
+    switch (conflict.kind) {
+        case 'modify-vs-delete': {
+            // A recorded (empty) theirs state means theirs STRIPPED the entity
+            // rather than tombstoning it — resolve with removal opinions so no
+            // subtree-shadowing tombstone is fabricated.
+            if (conflict.theirs !== undefined) {
+                const baseComponents = (conflict.base?.attributes ?? {});
+                const oursComponents = (conflict.ours?.attributes ?? {});
+                const ops = [];
+                const keys = new Set([...Object.keys(baseComponents), ...Object.keys(oursComponents)]);
+                for (const componentKey of keys) {
+                    ops.push(...opsForComponentChange(conflict.path, componentKey, baseComponents[componentKey], undefined, oursComponents[componentKey]));
+                }
+                return ops;
+            }
+            // Theirs tombstoned the entity ours kept editing.
+            return [{ op: 'tombstone-entity', path: conflict.path }];
+        }
+        case 'delete-vs-modify': {
+            // Theirs kept editing what ours tombstoned: resurrect and restore.
+            // Ours' pre-tombstone opinions become visible again on resurrect, so
+            // the restore must cover the union of theirs' and ours' components —
+            // an ours-only component has to be tombstoned, not left shining.
+            const ops = [{ op: 'resurrect-entity', path: conflict.path }];
+            const theirsComponents = (conflict.theirs?.attributes ?? {});
+            const oursComponents = (conflict.ours?.attributes ?? {});
+            const keys = new Set([...Object.keys(theirsComponents), ...Object.keys(oursComponents)]);
+            for (const componentKey of keys) {
+                ops.push(...opsForComponentChange(conflict.path, componentKey, undefined, theirsComponents[componentKey], oursComponents[componentKey]));
+            }
+            return ops;
+        }
+        default:
+            throw new Error(`entity-level conflict of kind ${conflict.kind} cannot take theirs`);
+    }
+}
+/** Serialize ops as ordinary IFCX node opinions, one node per path. */
+export function opsToNodes(ops) {
+    const byPath = new Map();
+    const nodeFor = (path) => {
+        let node = byPath.get(path);
+        if (!node) {
+            node = { path };
+            byPath.set(path, node);
+        }
+        return node;
+    };
+    for (const op of ops) {
+        const node = nodeFor(op.path);
+        switch (op.op) {
+            case 'set-component':
+            case 'tombstone-component':
+                node.attributes = { ...node.attributes, ...op.attributes };
+                break;
+            case 'tombstone-entity':
+                node.attributes = { ...node.attributes, [IFCLITE_ATTR.DELETED]: true };
+                break;
+            case 'resurrect-entity':
+                node.attributes = { ...node.attributes, [IFCLITE_ATTR.DELETED]: false };
+                break;
+            case 'set-child':
+                node.children = { ...node.children, [op.name]: op.child };
+                break;
+            case 'remove-child':
+                node.children = { ...node.children, [op.name]: null };
+                break;
+            case 'set-inherit':
+                node.inherits = { ...node.inherits, [op.name]: op.target };
+                break;
+            case 'remove-inherit':
+                node.inherits = { ...node.inherits, [op.name]: null };
+                break;
+        }
+    }
+    return [...byPath.values()].sort((a, b) => (a.path < b.path ? -1 : a.path > b.path ? 1 : 0));
+}
+/**
+ * Emit an immutable merge layer: ops as IFCX nodes plus a provenance
+ * manifest with `merge` filled, content-addressed by canonical blake3.
+ */
+export function buildMergeLayer(init) {
+    const mergeRecord = {
+        candidate: init.merge.candidate,
+        into: init.merge.into,
+        resolutions: init.merge.resolutions,
+        waived_checks: init.merge.waived_checks ?? [],
+        resolver: init.merge.resolver,
+    };
+    const manifest = createProvenanceManifest({
+        author: init.author,
+        intent: init.intent,
+        base: init.base,
+        created: init.created,
+        parents: init.parents ?? (init.base ? [init.base.id] : []),
+        checks: init.checks ?? [],
+        merge: mergeRecord,
+    });
+    const bare = {
+        header: {
+            id: '',
+            ifcxVersion: init.ifcxVersion ?? 'ifcx_alpha',
+            dataVersion: init.dataVersion ?? '1.0.0',
+            author: init.author.principal,
+            timestamp: manifest.created,
+        },
+        imports: [],
+        schemas: {},
+        data: opsToNodes(init.ops),
+    };
+    const withManifest = setProvenance(bare, manifest);
+    const layerId = computeLayerId(withManifest);
+    return {
+        file: { ...withManifest, header: { ...withManifest.header, id: layerId } },
+        layerId,
+    };
+}
+//# sourceMappingURL=merge-layer.js.map

package/dist/merge-layer.js.map

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

package/dist/rebase.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Rebase: state-based ops make this cheap — re-run the three-way plan
+ * against the new base. Prior resolutions replay automatically because
+ * resolution ops shadow. No operational transform, ever (05 §5.4).
+ */
+import type { IfcxFile } from '@ifc-lite/ifcx';
+import type { MergePlan, ResolutionInput } from './types.js';
+import { type AppliedResolutions } from './merge-layer.js';
+export interface RebaseInputs {
+    /** The candidate layer being rebased. */
+    candidate: IfcxFile;
+    /** The candidate's original base, ordered weakest first. */
+    oldBase: readonly IfcxFile[];
+    /** The new base to plan against, ordered weakest first. */
+    newBase: readonly IfcxFile[];
+    /** Resolutions from earlier merge attempts, replayed onto the new plan. */
+    priorResolutions?: readonly ResolutionInput[];
+}
+export interface RebaseResult {
+    plan: MergePlan;
+    /** Prior resolutions applied to the new plan (replayed automatically). */
+    applied: AppliedResolutions;
+}
+export declare function planRebase(inputs: RebaseInputs): RebaseResult;
+//# sourceMappingURL=rebase.d.ts.map

package/dist/rebase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../src/rebase.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,SAAS,EAAE,QAAQ,CAAC;IACpB,4DAA4D;IAC5D,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC7B,2DAA2D;IAC3D,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC7B,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;CAC/C;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,SAAS,CAAC;IAChB,0EAA0E;IAC1E,OAAO,EAAE,kBAAkB,CAAC;CAC7B;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAQ7D"}

package/dist/rebase.js

@@ -0,0 +1,15 @@
+/* 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/. */
+import { planThreeWayMerge } from './three-way.js';
+import { applyResolutions } from './merge-layer.js';
+export function planRebase(inputs) {
+    const plan = planThreeWayMerge({
+        ancestor: inputs.oldBase,
+        ours: inputs.newBase,
+        theirs: [...inputs.oldBase, inputs.candidate],
+    });
+    const applied = applyResolutions(plan, inputs.priorResolutions ?? []);
+    return { plan, applied };
+}
+//# sourceMappingURL=rebase.js.map

package/dist/rebase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../src/rebase.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAU/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,kBAAkB,CAAC;AAmB7E,MAAM,UAAU,UAAU,CAAC,MAAoB;IAC7C,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC7B,QAAQ,EAAE,MAAM,CAAC,OAAO;QACxB,IAAI,EAAE,MAAM,CAAC,OAAO;QACpB,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC;KAC9C,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;IACtE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC"}

package/dist/ref-flow.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Store-agnostic layer-PR merge flow: fast-forward when the candidate was
+ * authored against the ref's current stack, otherwise a three-way plan
+ * with explicit conflicts, blanket resolutions, and ref-policy
+ * enforcement (required checks, human approval) before completion.
+ *
+ * The flow is shared verbatim by the CLI (`ifc layer merge`, filesystem
+ * store) and the registry route (`POST /api/v1/refs/:name/merge`,
+ * collab-server) — one decision procedure, two transports, no drift.
+ */
+import type { IfcxFile, ProvenanceBase, ProvenanceManifest } from '@ifc-lite/ifcx';
+import type { MergeConflict, MergePlan, ResolutionInput } from './types.js';
+export interface RefPolicy {
+    requireHumanApproval?: boolean;
+    requiredChecks?: string[];
+}
+export interface RefEntry {
+    /** Ordered layer ids, weakest first. */
+    layers: string[];
+    policy?: RefPolicy;
+}
+/** Minimal store surface the merge flow needs; implementations own durability. */
+export interface LayerRefStore {
+    loadLayer(layerId: string): IfcxFile;
+    /** Persist a published layer; `file.header.id` is its blake3 id. */
+    storeLayer(file: IfcxFile): string;
+    getRef(name: string): RefEntry | undefined;
+    setRef(name: string, entry: RefEntry): void;
+    /** Optional id-prefix resolution (CLI convenience); identity if absent. */
+    resolveLayerId?(idOrPrefix: string): string;
+}
+export interface AncestorResolution {
+    /** Ordered layer documents forming the ancestor stack. */
+    layers: IfcxFile[];
+    /** Layer ids forming the ancestor stack. */
+    ids: string[];
+    /** False when manifest.base was null or matched no prefix of the ref. */
+    matched: boolean;
+}
+/**
+ * Resolve a candidate's `manifest.base` to a prefix of the ref's layer
+ * list: a stack base matches the prefix with the same stack hash, a layer
+ * base matches the prefix ending at that layer id.
+ */
+export declare function resolveAncestor(store: Pick<LayerRefStore, 'loadLayer'>, refLayerIds: readonly string[], base: ProvenanceBase | null | undefined): AncestorResolution;
+export interface Waiver {
+    spec: string;
+    reason: string;
+}
+/** Returns a failure message when the ref's policy blocks completion. */
+export declare function checkRefPolicy(entry: RefEntry, manifest: ProvenanceManifest | undefined, waivers: readonly Waiver[], approvedBy: string | undefined): string | undefined;
+export interface MergeInit {
+    candidateId: string;
+    into: string;
+    preview?: boolean;
+    resolve?: 'ours' | 'theirs';
+    /**
+     * Per-conflict resolutions (the review-UI flow: preview, decide each
+     * conflict, execute). Takes precedence over the blanket `resolve`;
+     * conflicts left unaddressed surface as a `conflicts` outcome.
+     */
+    resolutions?: ResolutionInput[];
+    waivers?: Waiver[];
+    approvedBy?: string;
+    principal?: string;
+    created?: string;
+    /** Merge a candidate whose declared base matches nothing on the ref. */
+    allowUnrelated?: boolean;
+}
+export type MergeOutcome = {
+    status: 'fast-forward';
+    refLayers: string[];
+    ancestorMatched: true;
+} | {
+    status: 'preview';
+    plan: MergePlan;
+    ancestorMatched: boolean;
+} | {
+    status: 'conflicts';
+    conflicts: MergeConflict[];
+    ancestorMatched: boolean;
+} | {
+    status: 'policy-failure';
+    reason: string;
+} | {
+    status: 'unrelated-base';
+    declaredBase: ProvenanceBase;
+} | {
+    status: 'merged';
+    mergeLayerId: string;
+    refLayers: string[];
+    plan: MergePlan;
+    ancestorMatched: boolean;
+};
+/** Core merge flow; returns an outcome instead of exiting (transport-neutral). */
+export declare function mergeIntoRef(store: LayerRefStore, init: MergeInit): MergeOutcome;
+//# sourceMappingURL=ref-flow.d.ts.map

package/dist/ref-flow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ref-flow.d.ts","sourceRoot":"","sources":["../src/ref-flow.ts"],"names":[],"mappings":"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"}

package/dist/ref-flow.js

@@ -0,0 +1,180 @@
+/* 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/. */
+import { computeStackHash, getProvenance } from '@ifc-lite/ifcx';
+import { applyResolutions, buildMergeLayer } from './merge-layer.js';
+import { planThreeWayMerge } from './three-way.js';
+/**
+ * Resolve a candidate's `manifest.base` to a prefix of the ref's layer
+ * list: a stack base matches the prefix with the same stack hash, a layer
+ * base matches the prefix ending at that layer id.
+ */
+export function resolveAncestor(store, refLayerIds, base) {
+    const load = (ids) => ids.map((id) => store.loadLayer(id));
+    // Null/missing base: ancestor is the empty stack ("warn" case in 09).
+    if (base == null)
+        return { layers: [], ids: [], matched: false };
+    if (base.kind === 'layer') {
+        const idx = refLayerIds.indexOf(base.id);
+        if (idx !== -1) {
+            const ids = refLayerIds.slice(0, idx + 1);
+            return { layers: load(ids), ids: [...ids], matched: true };
+        }
+        return { layers: [], ids: [], matched: false };
+    }
+    for (let i = 0; i <= refLayerIds.length; i++) {
+        const prefix = refLayerIds.slice(0, i);
+        if (computeStackHash(prefix) === base.id) {
+            return { layers: load(prefix), ids: [...prefix], matched: true };
+        }
+    }
+    return { layers: [], ids: [], matched: false };
+}
+/** Returns a failure message when the ref's policy blocks completion. */
+export function checkRefPolicy(entry, manifest, waivers, approvedBy) {
+    const policy = entry.policy;
+    if (!policy)
+        return undefined;
+    const waived = new Set(waivers.map((w) => w.spec));
+    for (const spec of policy.requiredChecks ?? []) {
+        if (waived.has(spec))
+            continue;
+        const passing = (manifest?.checks ?? []).some((c) => c.spec === spec && c.result === 'pass');
+        if (!passing) {
+            return `required check "${spec}" did not pass on the candidate (waive with --waive "${spec}" --reason "...")`;
+        }
+    }
+    // Fail closed on unknown authorship: a candidate with no provenance
+    // manifest could be an agent layer with the manifest stripped — the
+    // approval gate must not be bypassable that way.
+    if (policy.requireHumanApproval &&
+        (manifest === undefined || manifest.author.kind === 'agent') &&
+        approvedBy === undefined) {
+        return 'ref requires human approval for agent-authored (or manifest-less) layers (pass --approved-by <principal>)';
+    }
+    return undefined;
+}
+/**
+ * True when completing this merge would rely on a waiver — a required
+ * check that has no passing evidence on the manifest and is only
+ * satisfied because it was waived. Such merges must leave a durable
+ * record (`manifest.merge.waived_checks`), so they cannot take the plain
+ * fast-forward path that appends no merge layer.
+ */
+function waiversConsumed(entry, manifest, waivers) {
+    const required = entry.policy?.requiredChecks ?? [];
+    if (required.length === 0 || waivers.length === 0)
+        return false;
+    const waived = new Set(waivers.map((w) => w.spec));
+    return required.some((spec) => waived.has(spec) &&
+        !(manifest?.checks ?? []).some((c) => c.spec === spec && c.result === 'pass'));
+}
+/** Core merge flow; returns an outcome instead of exiting (transport-neutral). */
+export function mergeIntoRef(store, init) {
+    const candidateId = store.resolveLayerId ? store.resolveLayerId(init.candidateId) : init.candidateId;
+    const candidate = store.loadLayer(candidateId);
+    const manifest = getProvenance(candidate);
+    const entry = store.getRef(init.into);
+    if (!entry)
+        throw new Error(`No ref named "${init.into}"`);
+    const oursIds = [...entry.layers];
+    const waivers = init.waivers ?? [];
+    const resolver = init.principal ?? 'unknown';
+    // Fast path: candidate authored against the ref's current stack. A
+    // merge that consumes a waiver falls through to the three-way path so
+    // the waiver is durably recorded on a merge layer.
+    if (manifest?.base?.kind === 'stack' && manifest.base.id === computeStackHash(oursIds)) {
+        if (init.preview) {
+            // Preview of a fast-forward is an empty plan.
+            return {
+                status: 'preview',
+                plan: { autoOps: [], conflicts: [], stats: { touched: 0, autoMerged: 0, conflicting: 0 } },
+                ancestorMatched: true,
+            };
+        }
+        const failure = checkRefPolicy(entry, manifest, waivers, init.approvedBy);
+        if (failure)
+            return { status: 'policy-failure', reason: failure };
+        if (!waiversConsumed(entry, manifest, waivers)) {
+            const refLayers = [...oursIds, candidateId];
+            store.setRef(init.into, { ...entry, layers: refLayers });
+            return { status: 'fast-forward', refLayers, ancestorMatched: true };
+        }
+    }
+    const ancestor = resolveAncestor(store, oursIds, manifest?.base ?? null);
+    // A candidate that DECLARES a base which matches nothing on the ref was
+    // authored against a different history: three-way planning against an
+    // empty ancestor would read its every op as "new" and steamroll the
+    // ref. Refuse unless explicitly overridden. (Baseless candidates keep
+    // the documented warn-and-proceed semantics — null base is a legitimate
+    // publish mode, not a mismatch.)
+    if (manifest?.base != null && !ancestor.matched && !init.preview && !init.allowUnrelated) {
+        return { status: 'unrelated-base', declaredBase: manifest.base };
+    }
+    const ours = oursIds.map((id) => store.loadLayer(id));
+    const plan = planThreeWayMerge({
+        ancestor: ancestor.layers,
+        ours,
+        theirs: [...ancestor.layers, candidate],
+    });
+    if (init.preview)
+        return { status: 'preview', plan, ancestorMatched: ancestor.matched };
+    let resolutionInputs = [];
+    if (plan.conflicts.length > 0) {
+        if (init.resolutions !== undefined && init.resolutions.length > 0) {
+            resolutionInputs = init.resolutions;
+        }
+        else if (init.resolve) {
+            const choice = init.resolve;
+            resolutionInputs = plan.conflicts.map((conflict) => {
+                const input = { path: conflict.path, choice };
+                if (conflict.componentKey !== undefined)
+                    input.componentKey = conflict.componentKey;
+                return input;
+            });
+        }
+        else {
+            return { status: 'conflicts', conflicts: plan.conflicts, ancestorMatched: ancestor.matched };
+        }
+    }
+    const applied = applyResolutions(plan, resolutionInputs);
+    if (applied.unresolved.length > 0) {
+        return { status: 'conflicts', conflicts: applied.unresolved, ancestorMatched: ancestor.matched };
+    }
+    const failure = checkRefPolicy(entry, manifest, waivers, init.approvedBy);
+    if (failure)
+        return { status: 'policy-failure', reason: failure };
+    const waivedChecks = waivers.map((w) => ({
+        spec: w.spec,
+        reason: w.reason,
+        waivedBy: resolver,
+    }));
+    const merged = buildMergeLayer({
+        ops: [...plan.autoOps, ...applied.ops],
+        author: { kind: 'human', principal: resolver },
+        intent: `Merge ${candidateId} into ${init.into}`,
+        base: { kind: 'stack', id: computeStackHash(oursIds) },
+        merge: {
+            candidate: candidateId,
+            into: init.into,
+            resolutions: applied.resolutions,
+            waived_checks: waivedChecks,
+            resolver,
+        },
+        created: init.created,
+    });
+    // The store owns the persisted identity: a backend that canonicalizes
+    // or re-materializes content may return a different id than the one
+    // precomputed on the merge layer.
+    const mergeLayerId = store.storeLayer(merged.file);
+    const refLayers = [...oursIds, mergeLayerId];
+    store.setRef(init.into, { ...entry, layers: refLayers });
+    return {
+        status: 'merged',
+        mergeLayerId,
+        refLayers,
+        plan,
+        ancestorMatched: ancestor.matched,
+    };
+}
+//# sourceMappingURL=ref-flow.js.map

package/dist/ref-flow.js.map

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

package/dist/state-diff.d.ts

@@ -0,0 +1,25 @@
+/**
+ * The shared layer-diff JSON (roadmap cross-cutting item): ONE shape,
+ * ONE implementation, consumed identically by the CLI (`ifc layer
+ * diff --json`), the MCP `diff_layer` tool, and the review UI. Output is
+ * deterministically ordered (paths and component keys sorted) so equal
+ * states always serialize to byte-equal JSON.
+ */
+import type { IfcxFile } from '@ifc-lite/ifcx';
+import type { StackState } from './component-state.js';
+export interface ModifiedEntity {
+    path: string;
+    /** Component keys whose value changed, was added, or was removed. Sorted. */
+    components: string[];
+}
+/** The wire shape every transport emits verbatim. */
+export interface StackDiff {
+    added: string[];
+    deleted: string[];
+    modified: ModifiedEntity[];
+}
+/** Diff two composed states: `from` (base) → `to` (target). */
+export declare function diffStackStates(from: StackState, to: StackState): StackDiff;
+/** Diff two ordered layer lists (`from` is the base side). */
+export declare function diffLayerStacks(from: readonly IfcxFile[], to: readonly IfcxFile[]): StackDiff;
+//# sourceMappingURL=state-diff.d.ts.map

package/dist/state-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"state-diff.d.ts","sourceRoot":"","sources":["../src/state-diff.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,qDAAqD;AACrD,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B;AAOD,+DAA+D;AAC/D,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,GAAG,SAAS,CAsC3E;AAED,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,EAAE,EAAE,EAAE,SAAS,QAAQ,EAAE,GAAG,SAAS,CAE7F"}

package/dist/state-diff.js

@@ -0,0 +1,55 @@
+/* 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/. */
+import { componentEntries, extractStackState, snapshotOf } from './component-state.js';
+function alive(state, path) {
+    const entity = state.get(path);
+    return entity !== undefined && !entity.deleted;
+}
+/** Diff two composed states: `from` (base) → `to` (target). */
+export function diffStackStates(from, to) {
+    const added = [];
+    const deleted = [];
+    const modified = [];
+    const paths = [...new Set([...from.keys(), ...to.keys()])].sort();
+    for (const path of paths) {
+        const inFrom = alive(from, path);
+        const inTo = alive(to, path);
+        if (!inFrom && inTo) {
+            added.push(path);
+            continue;
+        }
+        if (inFrom && !inTo) {
+            deleted.push(path);
+            continue;
+        }
+        if (!inFrom && !inTo)
+            continue;
+        const fromEntity = from.get(path);
+        const toEntity = to.get(path);
+        if (!fromEntity || !toEntity)
+            continue;
+        const fromComponents = componentEntries(fromEntity);
+        const toComponents = componentEntries(toEntity);
+        const keys = [...new Set([...fromComponents.keys(), ...toComponents.keys()])].sort();
+        const changed = [];
+        for (const key of keys) {
+            const a = fromComponents.get(key);
+            const b = toComponents.get(key);
+            if (a === b)
+                continue;
+            const aHash = a === undefined ? undefined : snapshotOf(a).hash;
+            const bHash = b === undefined ? undefined : snapshotOf(b).hash;
+            if (aHash !== bHash)
+                changed.push(key);
+        }
+        if (changed.length > 0)
+            modified.push({ path, components: changed });
+    }
+    return { added, deleted, modified };
+}
+/** Diff two ordered layer lists (`from` is the base side). */
+export function diffLayerStacks(from, to) {
+    return diffStackStates(extractStackState(from), extractStackState(to));
+}
+//# sourceMappingURL=state-diff.js.map

package/dist/state-diff.js.map

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