@ifc-lite/merge 0.1.0

package/dist/three-way.d.ts

@@ -0,0 +1,46 @@
+/**
+ * Three-way merge: two runs of the two-way comparison joined on identity,
+ * iterated over the union of touched (entity, componentKey) pairs.
+ *
+ * Inputs: ancestor A = the candidate layer's base, ours O = the target
+ * ref's state, theirs T = the candidate applied to A. The plan's autoOps
+ * apply on top of O; "keep ours" therefore emits nothing.
+ *
+ * Decision matrix (05 §5.3):
+ *
+ *   A→O unchanged, A→T changed            → take theirs (auto)
+ *   A→O changed,  A→T unchanged           → keep ours (auto)
+ *   both changed, equal sub-hash          → fold (auto)
+ *   both changed, different               → conflict: concurrent-edit
+ *   tombstoned vs changed                 → conflict: delete-vs-modify
+ *   changed vs tombstoned                 → conflict: modify-vs-delete
+ *   tombstoned vs tombstoned              → fold (auto)
+ *
+ * Relations use the same matrix over `child:<name>` slots; divergent
+ * reparenting surfaces as a `hierarchy` conflict.
+ */
+import type { IfcxFile } from '@ifc-lite/ifcx';
+import type { ComponentAttributes, ComponentKey, MergeOp, MergePlan } from './types.js';
+import type { StackState } from './component-state.js';
+export interface ThreeWayInputs {
+    /** The candidate layer's base, ordered weakest first. */
+    ancestor: readonly IfcxFile[];
+    /** The target ref's state, ordered weakest first. */
+    ours: readonly IfcxFile[];
+    /** The candidate applied to its base, ordered weakest first. */
+    theirs: readonly IfcxFile[];
+}
+export declare function planThreeWayMerge(inputs: ThreeWayInputs): MergePlan;
+export declare function planFromStates(a: StackState, o: StackState, t: StackState): MergePlan;
+/**
+ * Ops that move one component from its ancestor value to the new value.
+ *
+ * The emitted node applies on top of the TARGET stack, where composition
+ * is per-attribute LWW — setting the surviving attributes alone would
+ * leave stale opinions (an attribute the candidate removed, or one ours
+ * added inside a component being resolved to theirs) shining through.
+ * Every key visible on the ancestor or ours side that `next` no longer
+ * carries is therefore explicitly nulled.
+ */
+export declare function opsForComponentChange(path: string, componentKey: ComponentKey, ancestor: ComponentAttributes | undefined, next: ComponentAttributes | undefined, oursVisible?: ComponentAttributes): MergeOp[];
+//# sourceMappingURL=three-way.d.ts.map

package/dist/three-way.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"three-way.d.ts","sourceRoot":"","sources":["../src/three-way.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EAEZ,OAAO,EACP,SAAS,EACV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAe,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAQpE,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,QAAQ,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC9B,qDAAqD;IACrD,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC1B,gEAAgE;IAChE,MAAM,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,CAoBnE;AAkBD,wBAAgB,cAAc,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,SAAS,CAsCrF;AAuVD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,mBAAmB,GAAG,SAAS,EACzC,IAAI,EAAE,mBAAmB,GAAG,SAAS,EACrC,WAAW,CAAC,EAAE,mBAAmB,GAChC,OAAO,EAAE,CA0BX"}

package/dist/three-way.js

@@ -0,0 +1,416 @@
+/* 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, projectStackStates, snapshotOf, } from './component-state.js';
+export function planThreeWayMerge(inputs) {
+    // Fast path (05 §5.7): when both sides extend the ancestor stack, only
+    // suffix-touched paths can differ — project those instead of folding
+    // and hashing the full model three times. Falls back to the reference
+    // extraction for tombstone-bearing stacks (subtree shadowing is global)
+    // and for unrelated stacks. Equivalence is enforced by the differential
+    // fuzz in fast-path-differential.test.ts.
+    if (sharesAncestorPrefix(inputs.ours, inputs.ancestor) && sharesAncestorPrefix(inputs.theirs, inputs.ancestor)) {
+        const projected = projectStackStates(inputs.ancestor, inputs.ours.slice(inputs.ancestor.length), inputs.theirs.slice(inputs.ancestor.length));
+        if (projected)
+            return planFromStates(projected.a, projected.o, projected.t);
+    }
+    return planFromStates(extractStackState(inputs.ancestor), extractStackState(inputs.ours), extractStackState(inputs.theirs));
+}
+/**
+ * True when `stack` starts with the ancestor's layers: same documents by
+ * reference, or by content address (equal blake3 ids imply identical
+ * canonical bytes; non-blake3 test ids only count when reference-equal).
+ */
+function sharesAncestorPrefix(stack, ancestor) {
+    if (stack.length < ancestor.length)
+        return false;
+    for (let i = 0; i < ancestor.length; i++) {
+        if (stack[i] === ancestor[i])
+            continue;
+        const id = ancestor[i].header.id;
+        if (id.startsWith('blake3:') && stack[i].header.id === id)
+            continue;
+        return false;
+    }
+    return true;
+}
+export function planFromStates(a, o, t) {
+    const autoOps = [];
+    const conflicts = [];
+    let touched = 0;
+    // Memoized per plan: with the projection sharing untouched component
+    // objects across sides, reference equality + this cache keep hashing
+    // proportional to the number of actually-edited components.
+    const hashes = new WeakMap();
+    const hashOf = (attrs) => {
+        if (attrs === undefined)
+            return undefined;
+        let hash = hashes.get(attrs);
+        if (hash === undefined) {
+            hash = snapshotOf(attrs).hash;
+            hashes.set(attrs, hash);
+        }
+        return hash;
+    };
+    const paths = new Set([...a.keys(), ...o.keys(), ...t.keys()]);
+    for (const path of paths) {
+        const result = mergeEntity(path, a.get(path), o.get(path), t.get(path), hashOf);
+        autoOps.push(...result.ops);
+        conflicts.push(...result.conflicts);
+        touched += result.touched;
+    }
+    const escalated = escalateShadowedConflicts(a, o, t, autoOps, conflicts);
+    return {
+        autoOps: escalated.autoOps,
+        conflicts: escalated.conflicts,
+        stats: {
+            touched,
+            autoMerged: escalated.autoOps.length,
+            conflicting: escalated.conflicts.length,
+        },
+    };
+}
+/**
+ * A conflict on a path that is SHADOW-dead on one side cannot be decided
+ * on its own: subtree shadowing beats a child resurrect at composition
+ * time, so any per-child resolution against a dead ancestor is a silent
+ * no-op. The decision belongs to the tombstoned root:
+ *
+ * - Theirs tombstoned root R, ours edited descendants → R's auto
+ *   tombstone is demoted to a `modify-vs-delete` conflict on R and the
+ *   descendant conflicts fold into it (`subtree`): resolving R = theirs
+ *   deletes the subtree knowingly; R = ours keeps it, edits and all.
+ * - Ours tombstoned root R, theirs edited descendants → R gains a
+ *   `delete-vs-modify` conflict (it had none: theirs never touched R
+ *   itself). The descendant conflicts stay — their theirs-resolutions
+ *   carry the actual edits and become satisfiable once R is resurrected.
+ */
+function escalateShadowedConflicts(a, o, t, autoOps, conflicts) {
+    const shadowDeadIn = (state, path) => {
+        const entity = state.get(path);
+        return entity !== undefined && entity.deleted && !entity.explicitDeleted;
+    };
+    const needsPass = conflicts.some((c) => c.componentKey === undefined && (shadowDeadIn(t, c.path) || shadowDeadIn(o, c.path)));
+    if (!needsPass)
+        return { autoOps, conflicts };
+    const parentMaps = new Map();
+    const parentsOf = (state) => {
+        let parents = parentMaps.get(state);
+        if (!parents) {
+            parents = new Map();
+            for (const entity of state.values()) {
+                for (const child of entity.children.values()) {
+                    if (!parents.has(child))
+                        parents.set(child, entity.path);
+                }
+            }
+            parentMaps.set(state, parents);
+        }
+        return parents;
+    };
+    const rootIn = (state, path) => {
+        // Nearest ancestor (via the state's children graph) whose death is
+        // explicit on its own path.
+        const parents = parentsOf(state);
+        const seen = new Set([path]);
+        let current = parents.get(path);
+        while (current !== undefined && !seen.has(current)) {
+            const entity = state.get(current);
+            if (entity?.explicitDeleted)
+                return current;
+            seen.add(current);
+            current = parents.get(current);
+        }
+        return undefined;
+    };
+    const keptConflicts = [];
+    // Root path → descendant conflict paths folded into its decision.
+    const theirsRoots = new Map();
+    const oursRoots = new Map();
+    for (const conflict of conflicts) {
+        if (conflict.componentKey === undefined && shadowDeadIn(t, conflict.path)) {
+            const root = rootIn(t, conflict.path);
+            if (root !== undefined) {
+                // Folded into the root's decision; the ours-side edits need no
+                // ops (they are already in the target stack).
+                const list = theirsRoots.get(root) ?? [];
+                list.push(conflict.path);
+                theirsRoots.set(root, list);
+                continue;
+            }
+        }
+        if (conflict.componentKey === undefined && shadowDeadIn(o, conflict.path)) {
+            const root = rootIn(o, conflict.path);
+            if (root !== undefined) {
+                const list = oursRoots.get(root) ?? [];
+                list.push(conflict.path);
+                oursRoots.set(root, list);
+                // Kept: its theirs-resolution carries the descendant's edits.
+                keptConflicts.push(conflict);
+                continue;
+            }
+        }
+        keptConflicts.push(conflict);
+    }
+    let ops = autoOps;
+    for (const [root, subtree] of theirsRoots) {
+        ops = ops.filter((op) => !(op.op === 'tombstone-entity' && op.path === root));
+        const existing = keptConflicts.find((c) => c.path === root && c.componentKey === undefined);
+        if (existing) {
+            existing.subtree = [...(existing.subtree ?? []), ...subtree].sort();
+            continue;
+        }
+        const oEntity = o.get(root);
+        const aEntity = a.get(root);
+        keptConflicts.push({
+            kind: 'modify-vs-delete',
+            path: root,
+            ours: snapshotOf(Object.fromEntries(componentsOf(oEntity).entries())),
+            ...(aEntity && !aEntity.deleted
+                ? { base: snapshotOf(Object.fromEntries(componentsOf(aEntity).entries())) }
+                : {}),
+            subtree: subtree.sort(),
+        });
+    }
+    for (const [root, subtree] of oursRoots) {
+        const existing = keptConflicts.find((c) => c.path === root && c.componentKey === undefined);
+        if (existing) {
+            existing.subtree = [...(existing.subtree ?? []), ...subtree].sort();
+            continue;
+        }
+        const tEntity = t.get(root);
+        const oEntity = o.get(root);
+        const aEntity = a.get(root);
+        keptConflicts.push({
+            kind: 'delete-vs-modify',
+            path: root,
+            theirs: snapshotOf(Object.fromEntries(componentsOf(tEntity).entries())),
+            ours: snapshotOf(Object.fromEntries(componentsOf(oEntity).entries())),
+            ...(aEntity && !aEntity.deleted
+                ? { base: snapshotOf(Object.fromEntries(componentsOf(aEntity).entries())) }
+                : {}),
+            subtree: subtree.sort(),
+        });
+    }
+    return { autoOps: ops, conflicts: keptConflicts };
+}
+function alive(entity) {
+    return entity !== undefined && !entity.deleted;
+}
+function componentsOf(entity) {
+    return entity ? componentEntries(entity) : new Map();
+}
+function componentsEqual(x, y, hashOf) {
+    if (x.size !== y.size)
+        return false;
+    for (const [key, attrs] of x) {
+        const other = y.get(key);
+        if (!other)
+            return false;
+        if (other === attrs)
+            continue;
+        if (hashOf(other) !== hashOf(attrs))
+            return false;
+    }
+    return true;
+}
+function mergeEntity(path, aEntity, oEntity, tEntity, hashOf) {
+    const aAlive = alive(aEntity);
+    const oAlive = alive(oEntity);
+    const tAlive = alive(tEntity);
+    const aComponents = componentsOf(aEntity);
+    const oComponents = componentsOf(oEntity);
+    const tComponents = componentsOf(tEntity);
+    // Both sides agree the entity is gone (or never both created it): fold.
+    // Component edits under a double-sided tombstone are unobservable and
+    // fold with the deletion.
+    if (!oAlive && !tAlive)
+        return { ops: [], conflicts: [], touched: aAlive ? 1 : 0 };
+    // A change is a component edit OR an alive-state flip: a resurrection
+    // carries no component delta but is still a change (05 §5.3) — comparing
+    // components alone would silently drop it (or worse, re-delete it).
+    const oChanged = oAlive !== aAlive || !componentsEqual(aComponents, oComponents, hashOf);
+    const tChanged = tAlive !== aAlive || !componentsEqual(aComponents, tComponents, hashOf);
+    // Theirs didn't touch it (same alive-state, same components as the
+    // ancestor): whatever ours did stands. Covers ours-only adds, edits,
+    // deletes AND resurrections.
+    if (!tChanged)
+        return { ops: [], conflicts: [], touched: oChanged ? 1 : 0 };
+    // Ours didn't touch it: take theirs wholesale.
+    if (!oChanged) {
+        if (oAlive && !tAlive) {
+            // Theirs stripped it to an empty shell (nulled every attribute and
+            // slot; the extraction drops such entities, no tombstone): express
+            // that as removal opinions. A tombstone here would shadow-kill
+            // children theirs kept alive.
+            if (tEntity === undefined) {
+                return {
+                    ops: opsForComponentDelta(path, aComponents, new Map(), oComponents, hashOf),
+                    conflicts: [],
+                    touched: 1,
+                };
+            }
+            // Shadow-only deaths (a deleted ancestor node, not a tombstone on
+            // this path) emit nothing: the parent's own merge decision carries
+            // the subtree at composition time. Emitting here would re-delete a
+            // child the target reparented, or pre-empt a parent still in
+            // conflict.
+            if (tEntity.deleted && !tEntity.explicitDeleted) {
+                return { ops: [], conflicts: [], touched: 1 };
+            }
+            return { ops: [{ op: 'tombstone-entity', path }], conflicts: [], touched: 1 };
+        }
+        // Theirs is alive: added, resurrected, and/or edited.
+        const ops = [];
+        if (oEntity?.deleted === true || aEntity?.deleted === true) {
+            ops.push({ op: 'resurrect-entity', path });
+        }
+        ops.push(...opsForComponentDelta(path, aComponents, tComponents, oComponents, hashOf));
+        return { ops, conflicts: [], touched: 1 };
+    }
+    // Both changed. Convergent outcomes fold.
+    if (oAlive === tAlive && componentsEqual(oComponents, tComponents, hashOf)) {
+        return { ops: [], conflicts: [], touched: 1 };
+    }
+    // Ours deleted (or still dead) while theirs edited/resurrected.
+    if (!oAlive && tAlive) {
+        return {
+            ops: [],
+            conflicts: [
+                {
+                    kind: 'delete-vs-modify',
+                    path,
+                    theirs: snapshotOf(Object.fromEntries(tComponents.entries())),
+                    // Ours' opinions stay in the stack under the tombstone and become
+                    // visible again on resurrect — resolutions need them to null out.
+                    ours: snapshotOf(Object.fromEntries(oComponents.entries())),
+                    ...(aAlive ? { base: snapshotOf(Object.fromEntries(aComponents.entries())) } : {}),
+                },
+            ],
+            touched: 1,
+        };
+    }
+    // Ours edited/resurrected while theirs deleted.
+    if (oAlive && !tAlive) {
+        return {
+            ops: [],
+            conflicts: [
+                {
+                    kind: 'modify-vs-delete',
+                    path,
+                    ours: snapshotOf(Object.fromEntries(oComponents.entries())),
+                    ...(aAlive ? { base: snapshotOf(Object.fromEntries(aComponents.entries())) } : {}),
+                    // A shell-strip (no tombstone) records an empty theirs state so
+                    // a theirs-resolution emits removal opinions, not a tombstone
+                    // that would shadow-kill children theirs kept alive.
+                    ...(tEntity === undefined ? { theirs: snapshotOf({}) } : {}),
+                },
+            ],
+            touched: 1,
+        };
+    }
+    // Both alive: component-level matrix over the union of touched keys.
+    const ops = [];
+    const conflicts = [];
+    let touched = 0;
+    const keys = new Set([
+        ...aComponents.keys(),
+        ...oComponents.keys(),
+        ...tComponents.keys(),
+    ]);
+    for (const key of keys) {
+        const aAttrs = aComponents.get(key);
+        const oAttrs = oComponents.get(key);
+        const tAttrs = tComponents.get(key);
+        // Reference equality first (shared objects from the projection fast
+        // path); only genuinely diverging references pay for hashing.
+        if (aAttrs === oAttrs && aAttrs === tAttrs)
+            continue;
+        const oChanged = aAttrs === oAttrs ? false : hashOf(aAttrs) !== hashOf(oAttrs);
+        const tChanged = aAttrs === tAttrs ? false : hashOf(aAttrs) !== hashOf(tAttrs);
+        if (!oChanged && !tChanged)
+            continue;
+        touched += 1;
+        if (oChanged && !tChanged)
+            continue; // keep ours
+        if (oChanged && tChanged && (oAttrs === tAttrs || hashOf(oAttrs) === hashOf(tAttrs)))
+            continue; // fold
+        if (!oChanged && tChanged) {
+            ops.push(...opsForComponentChange(path, key, aAttrs, tAttrs, oAttrs));
+            continue;
+        }
+        // Both changed, different values.
+        conflicts.push({
+            kind: key.startsWith('child:') || key.startsWith('inherit:') ? 'hierarchy' : 'concurrent-edit',
+            path,
+            componentKey: key,
+            ...(aAttrs ? { base: snapshotOf(aAttrs) } : {}),
+            ...(oAttrs ? { ours: snapshotOf(oAttrs) } : {}),
+            ...(tAttrs ? { theirs: snapshotOf(tAttrs) } : {}),
+        });
+    }
+    return { ops, conflicts, touched };
+}
+/**
+ * Ops that transform an entity's components from the ancestor state to the
+ * theirs state, given that ours matches the ancestor per entity-level
+ * change detection. Emits only genuinely differing keys.
+ */
+function opsForComponentDelta(path, ancestor, theirs, ours, hashOf) {
+    const ops = [];
+    const keys = new Set([...ancestor.keys(), ...theirs.keys()]);
+    for (const key of keys) {
+        const aAttrs = ancestor.get(key);
+        const tAttrs = theirs.get(key);
+        if (aAttrs === tAttrs)
+            continue;
+        if (aAttrs !== undefined && tAttrs !== undefined && hashOf(aAttrs) === hashOf(tAttrs))
+            continue;
+        ops.push(...opsForComponentChange(path, key, aAttrs, tAttrs, ours.get(key)));
+    }
+    return ops;
+}
+/**
+ * Ops that move one component from its ancestor value to the new value.
+ *
+ * The emitted node applies on top of the TARGET stack, where composition
+ * is per-attribute LWW — setting the surviving attributes alone would
+ * leave stale opinions (an attribute the candidate removed, or one ours
+ * added inside a component being resolved to theirs) shining through.
+ * Every key visible on the ancestor or ours side that `next` no longer
+ * carries is therefore explicitly nulled.
+ */
+export function opsForComponentChange(path, componentKey, ancestor, next, oursVisible) {
+    if (componentKey.startsWith('child:')) {
+        const name = componentKey.slice('child:'.length);
+        if (next === undefined)
+            return [{ op: 'remove-child', path, name }];
+        return [{ op: 'set-child', path, name, child: String(next.child) }];
+    }
+    if (componentKey.startsWith('inherit:')) {
+        const name = componentKey.slice('inherit:'.length);
+        if (next === undefined)
+            return [{ op: 'remove-inherit', path, name }];
+        return [{ op: 'set-inherit', path, name, target: String(next.inherit) }];
+    }
+    if (next === undefined) {
+        const nulled = {};
+        for (const attr of Object.keys(ancestor ?? {}))
+            nulled[attr] = null;
+        for (const attr of Object.keys(oursVisible ?? {}))
+            nulled[attr] = null;
+        return [{ op: 'tombstone-component', path, componentKey, attributes: nulled }];
+    }
+    const attributes = {};
+    for (const attr of Object.keys(ancestor ?? {})) {
+        if (!(attr in next))
+            attributes[attr] = null;
+    }
+    for (const attr of Object.keys(oursVisible ?? {})) {
+        if (!(attr in next))
+            attributes[attr] = null;
+    }
+    Object.assign(attributes, next);
+    return [{ op: 'set-component', path, componentKey, attributes }];
+}
+//# sourceMappingURL=three-way.js.map

package/dist/three-way.js.map

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

package/dist/types.d.ts

@@ -0,0 +1,114 @@
+/**
+ * Layer-merge type vocabulary.
+ *
+ * Ops are state-based at (entity, componentKey) granularity: a
+ * `set-component` carries the full component value, never a transform.
+ * Composing is a deterministic fold where stronger layers shadow weaker
+ * per (entity, componentKey) — no OT machinery.
+ *
+ * Spec: docs/architecture/layer-prs/02-layer-format.md §2.2,
+ *       05-merge.md §5.3.
+ */
+/**
+ * Component key vocabulary shared with `@ifc-lite/diff` sub-hash mode:
+ * `attr:<group>`, `pset:<PsetName>`, `qset:<QsetName>`, `type-assignment`,
+ * `placement`, `geometry:<tier>`, plus `child:<name>` for relation slots.
+ */
+export type ComponentKey = string;
+/** A component's merged value: the IFCX attributes that form it. */
+export type ComponentAttributes = Record<string, unknown>;
+/** Semantic reading of a layer's nodes — the op model of 02 §2.2. */
+export type MergeOp = {
+    readonly op: 'set-component';
+    readonly path: string;
+    readonly componentKey: ComponentKey;
+    /** Full component value (state-based; LWW within a stack). */
+    readonly attributes: ComponentAttributes;
+} | {
+    readonly op: 'tombstone-component';
+    readonly path: string;
+    readonly componentKey: ComponentKey;
+    /** Attribute keys to null out (IFCX null = remove opinion). */
+    readonly attributes: ComponentAttributes;
+} | {
+    readonly op: 'tombstone-entity';
+    readonly path: string;
+} | {
+    readonly op: 'resurrect-entity';
+    readonly path: string;
+} | {
+    readonly op: 'set-child';
+    readonly path: string;
+    readonly name: string;
+    readonly child: string;
+} | {
+    readonly op: 'remove-child';
+    readonly path: string;
+    readonly name: string;
+} | {
+    readonly op: 'set-inherit';
+    readonly path: string;
+    readonly name: string;
+    readonly target: string;
+} | {
+    readonly op: 'remove-inherit';
+    readonly path: string;
+    readonly name: string;
+};
+/**
+ * Conflict taxonomy, lifted from `collab/conflicts/detector.ts` kinds from
+ * session level to merge level (05 §5.3).
+ */
+export type MergeConflictKind = 'concurrent-edit' | 'delete-vs-modify' | 'modify-vs-delete' | 'hierarchy';
+export interface ComponentSnapshot {
+    /** Stable sub-hash of the component value. */
+    hash: string;
+    attributes: ComponentAttributes;
+}
+export interface MergeConflict {
+    kind: MergeConflictKind;
+    /** Entity path the conflict is on. */
+    path: string;
+    /** Component the conflict is scoped to; absent for entity-level kinds. */
+    componentKey?: ComponentKey;
+    /** Ancestor value (undefined when the component did not exist in A). */
+    base?: ComponentSnapshot;
+    /** Target-side value (undefined when removed/absent on ours). */
+    ours?: ComponentSnapshot;
+    /** Candidate-side value (undefined when removed/absent on theirs). */
+    theirs?: ComponentSnapshot;
+    /**
+     * For an entity-level delete conflict whose tombstone shadow-kills
+     * descendants the other side touched: their paths. The delete decision
+     * on THIS entity carries the whole subtree - per-descendant choices
+     * against a dead ancestor would be unsatisfiable (subtree shadowing
+     * beats a child resurrect at composition time).
+     */
+    subtree?: string[];
+}
+export interface MergePlanStats {
+    /** (entity, componentKey) pairs touched by either side. */
+    touched: number;
+    autoMerged: number;
+    conflicting: number;
+}
+/**
+ * Result of a three-way plan: ops that apply cleanly on top of the target
+ * state, plus explicit conflict records awaiting resolution. Zero
+ * conflicts + green checks means the merge can complete unattended
+ * (subject to ref policy).
+ */
+export interface MergePlan {
+    autoOps: MergeOp[];
+    conflicts: MergeConflict[];
+    stats: MergePlanStats;
+}
+/** A reviewer's (or policy's) decision for one conflict. */
+export interface ResolutionInput {
+    path: string;
+    componentKey?: ComponentKey;
+    choice: 'ours' | 'theirs' | 'edited';
+    /** Replacement component value; required when `choice === 'edited'`. */
+    attributes?: ComponentAttributes;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/dist/types.js

@@ -0,0 +1,5 @@
+/* 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 {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;+DAE+D"}