@ifc-lite/collab 0.2.0

package/dist/branch/history.js

@@ -0,0 +1,223 @@
+/* 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 { snapshotToIfcx } from '../snapshot/to-ifcx.js';
+import { extractMinimalLayer } from '../snapshot/minimal-layer.js';
+import * as Y from 'yjs';
+/**
+ * Cheap deep clone for IFCX snapshots. Uses `structuredClone` when
+ * available (Node 17+, all modern browsers) and falls back to a
+ * JSON round-trip otherwise — IFCX is plain JSON so the round-trip is
+ * sufficient and loses nothing.
+ */
+function cloneIfcx(file) {
+    if (typeof structuredClone === 'function') {
+        return structuredClone(file);
+    }
+    return JSON.parse(JSON.stringify(file));
+}
+/* ------------------------------------------------------------------ */
+/* In-memory implementation                                            */
+/* ------------------------------------------------------------------ */
+export class MemoryHistorySidecar {
+    entriesByBranch = new Map();
+    branchInfo = new Map();
+    counter = 0;
+    constructor() {
+        this.branchInfo.set('main', {
+            name: 'main',
+            createdAt: new Date().toISOString(),
+        });
+        this.entriesByBranch.set('main', []);
+    }
+    nextEntryId() {
+        this.counter += 1;
+        return `e${this.counter}-${Date.now().toString(36)}`;
+    }
+    async record(input) {
+        const branch = input.branch ?? 'main';
+        if (!this.branchInfo.has(branch)) {
+            this.branchInfo.set(branch, { name: branch, createdAt: new Date().toISOString() });
+            this.entriesByBranch.set(branch, []);
+        }
+        // Deep-clone snapshot/diff so callers that reuse buffers or mutate
+        // their input objects (common in streaming snapshot pipelines)
+        // cannot poison historical entries after they were recorded.
+        const entry = {
+            entryId: this.nextEntryId(),
+            at: new Date().toISOString(),
+            branch,
+            authorClientId: input.authorClientId,
+            label: input.label,
+            snapshot: cloneIfcx(input.snapshot),
+            diff: input.diff ? cloneIfcx(input.diff) : undefined,
+        };
+        const arr = this.entriesByBranch.get(branch);
+        arr.push(entry);
+        return entry;
+    }
+    async entries(branch) {
+        if (branch)
+            return [...(this.entriesByBranch.get(branch) ?? [])];
+        const all = [];
+        for (const arr of this.entriesByBranch.values())
+            all.push(...arr);
+        return all.sort((a, b) => a.at.localeCompare(b.at));
+    }
+    async at(at, branch) {
+        const target = at instanceof Date ? at.toISOString() : at;
+        const list = await this.entries(branch);
+        let best = null;
+        for (const e of list) {
+            if (e.at <= target)
+                best = e;
+            else
+                break;
+        }
+        return best;
+    }
+    async diff(fromEntryId, toEntryId) {
+        const all = await this.entries();
+        const from = all.find((e) => e.entryId === fromEntryId);
+        const to = all.find((e) => e.entryId === toEntryId);
+        if (!from || !to) {
+            return { from: fromEntryId, to: toEntryId, added: [], removed: [], changed: [] };
+        }
+        const fromPaths = new Map();
+        const toPaths = new Map();
+        for (const n of from.snapshot.data ?? [])
+            fromPaths.set(n.path, n);
+        for (const n of to.snapshot.data ?? [])
+            toPaths.set(n.path, n);
+        const added = [];
+        const removed = [];
+        const changed = [];
+        for (const path of toPaths.keys()) {
+            if (!fromPaths.has(path))
+                added.push(path);
+            else if (JSON.stringify(toPaths.get(path)) !== JSON.stringify(fromPaths.get(path))) {
+                changed.push(path);
+            }
+        }
+        for (const path of fromPaths.keys()) {
+            if (!toPaths.has(path))
+                removed.push(path);
+        }
+        return {
+            from: fromEntryId,
+            to: toEntryId,
+            added: added.sort(),
+            removed: removed.sort(),
+            changed: changed.sort(),
+        };
+    }
+    async branches() {
+        return Array.from(this.branchInfo.values()).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+    }
+    async branch(name, fromEntryId) {
+        if (this.branchInfo.has(name)) {
+            throw new Error(`@ifc-lite/collab: branch "${name}" already exists`);
+        }
+        // Honor the documented default: when no explicit fork point is
+        // given, take the current head of `main`. Persisting `undefined`
+        // dropped fork ancestry for every caller that relied on the API
+        // signature's documented behavior.
+        let resolvedFork = fromEntryId;
+        if (!resolvedFork) {
+            const mainEntries = this.entriesByBranch.get('main') ?? [];
+            const head = mainEntries[mainEntries.length - 1];
+            if (head)
+                resolvedFork = head.entryId;
+        }
+        const info = {
+            name,
+            forkedFromEntryId: resolvedFork,
+            createdAt: new Date().toISOString(),
+        };
+        this.branchInfo.set(name, info);
+        this.entriesByBranch.set(name, []);
+        return info;
+    }
+    async merge(branch, into, mergedSnapshot) {
+        // Validate the source branch up front. Previously only `into` was
+        // checked, so a typo like merge('experimnet', 'main', …) wrote an
+        // irreversible merge entry with no resolvable source.
+        const sourceEntries = this.entriesByBranch.get(branch);
+        if (!sourceEntries) {
+            throw new Error(`@ifc-lite/collab: source branch "${branch}" not found`);
+        }
+        const targetEntries = this.entriesByBranch.get(into);
+        if (!targetEntries) {
+            throw new Error(`@ifc-lite/collab: target branch "${into}" not found`);
+        }
+        // Capture the source branch's CURRENT tip — the commit that was
+        // actually merged — into immutable metadata so the merge edge in
+        // the branch-tree view doesn't drift if the source branch keeps
+        // moving later.
+        const sourceTip = sourceEntries[sourceEntries.length - 1];
+        const entry = {
+            entryId: this.nextEntryId(),
+            at: new Date().toISOString(),
+            branch: into,
+            label: `merge ${branch} → ${into}`,
+            snapshot: cloneIfcx(mergedSnapshot),
+            mergedFromBranch: branch,
+            mergedFromEntryId: sourceTip?.entryId,
+        };
+        targetEntries.push(entry);
+        return entry;
+    }
+    async clear() {
+        this.entriesByBranch.clear();
+        this.branchInfo.clear();
+        this.branchInfo.set('main', { name: 'main', createdAt: new Date().toISOString() });
+        this.entriesByBranch.set('main', []);
+        this.counter = 0;
+    }
+}
+/**
+ * Drive a `HistorySidecar` from a live `CollabSession`. Records a
+ * snapshot every `intervalMs`, plus on-demand via `capture(label)`.
+ */
+export function attachHistorySidecar(session, sidecar, options = {}) {
+    const intervalMs = options.intervalMs ?? 60_000;
+    const branch = options.branch ?? 'main';
+    const includeDiff = options.includeDiff ?? true;
+    let lastBaseline = null;
+    const capture = async (label) => {
+        const ifcx = snapshotToIfcx(session.doc, options.snapshot);
+        const diff = includeDiff && lastBaseline
+            ? extractMinimalLayer(session.doc, lastBaseline, { snapshot: options.snapshot })
+            : undefined;
+        // Capture the candidate baseline BEFORE record() so we don't read
+        // the doc twice with a window in between, but only commit it to
+        // `lastBaseline` AFTER record() resolves. If persistence rejects,
+        // the next capture must still diff against the previously-recorded
+        // state — otherwise history can silently skip changes.
+        const nextBaseline = Y.encodeStateAsUpdate(session.doc);
+        const entry = await sidecar.record({
+            branch,
+            snapshot: ifcx,
+            diff,
+            label,
+            authorClientId: session.clientId,
+        });
+        lastBaseline = nextBaseline;
+        return entry;
+    };
+    const timer = setInterval(() => {
+        void capture().catch((err) => {
+            // eslint-disable-next-line no-console
+            console.error('[collab] history capture failed:', err);
+        });
+    }, intervalMs);
+    // Don't keep Node alive solely for this timer.
+    timer.unref?.();
+    return {
+        capture,
+        detach() {
+            clearInterval(timer);
+        },
+    };
+}
+//# sourceMappingURL=history.js.map

package/dist/branch/history.js.map

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

package/dist/branch/index.d.ts

@@ -0,0 +1,5 @@
+export * from './branch.js';
+export * from './history.js';
+export * from './history-automerge.js';
+export * from './branch-tree.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/branch/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/branch/index.ts"],"names":[],"mappings":"AAIA,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC"}

package/dist/branch/index.js

@@ -0,0 +1,8 @@
+/* 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 * from './branch.js';
+export * from './history.js';
+export * from './history-automerge.js';
+export * from './branch-tree.js';
+//# sourceMappingURL=index.js.map

package/dist/branch/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/branch/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC"}

package/dist/conflicts/detector.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Conflict detector.
+ *
+ * Observes Y.Doc transactions and emits structured events when concurrent
+ * edits land on the same target within a tunable window. The viewer (or
+ * any UI) listens to these events and renders a conflict badge plus an
+ * optional ghost overlay (§9.4 / §9.7).
+ *
+ * The CRDT itself never blocks or rolls back on conflict — it converges
+ * deterministically. Detection here is purely advisory: it tells the user
+ * "your peer changed this at the same time."
+ *
+ * Implementation note: we use `Transaction.changed` (struct-level
+ * changes) rather than `YEvent.keys` (head-level changes) because LWW
+ * can keep the existing head value when a remote struct loses, in which
+ * case `YEvent.keys` is empty even though there was a concurrent write.
+ * The struct-level view is what we want for the conflict surface.
+ */
+import * as Y from 'yjs';
+export type ConflictKind = 'attribute' | 'pset-property' | 'hierarchy' | 'geometry-blob' | 'geometry-param' | 'relationship-target' | 'concurrent-delete';
+export interface ConflictEvent {
+    kind: ConflictKind;
+    /** Entity / relationship / geometry path involved. */
+    path: string;
+    /** Sub-path (e.g. attribute name, `pset.prop`, role). */
+    field?: string;
+    /** clientIDs that contributed conflicting writes within the window. */
+    contributors: number[];
+    /** Wall-clock ms when the detector first flagged this conflict. */
+    detectedAt: number;
+}
+export type ConflictListener = (event: ConflictEvent) => void;
+export interface ConflictDetectorOptions {
+    /** Window in ms inside which two writes count as concurrent (default 750). */
+    windowMs?: number;
+}
+export interface ConflictDetector {
+    onConflict(listener: ConflictListener): () => void;
+    /** All currently-active conflicts (cleared after `windowMs * 4`). */
+    active(): ConflictEvent[];
+    destroy(): void;
+}
+/**
+ * Build a conflict detector for `doc`.
+ *
+ * Subscribes to `afterTransaction` and inspects `tr.changed`, which
+ * reports every key whose underlying struct list changed (independent of
+ * the head value). For each entry we resolve where in the tree the
+ * change happened and classify it into one of `ConflictKind`s.
+ */
+export declare function createConflictDetector(doc: Y.Doc, options?: ConflictDetectorOptions): ConflictDetector;
+//# sourceMappingURL=detector.d.ts.map

package/dist/conflicts/detector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"detector.d.ts","sourceRoot":"","sources":["../../src/conflicts/detector.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAWzB,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,eAAe,GACf,WAAW,GACX,eAAe,GACf,gBAAgB,GAChB,qBAAqB,GACrB,mBAAmB,CAAC;AAExB,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,YAAY,CAAC;IACnB,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACtC,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,IAAI,CAAC;IACnD,qEAAqE;IACrE,MAAM,IAAI,aAAa,EAAE,CAAC;IAC1B,OAAO,IAAI,IAAI,CAAC;CACjB;AAaD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,OAAO,GAAE,uBAA4B,GACpC,gBAAgB,CAyElB"}

package/dist/conflicts/detector.js

@@ -0,0 +1,226 @@
+/* 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 { ENTITY_KEY, GEOMETRY_KEY, RELATIONSHIP_KEY, TOP, } from '../doc/schema.js';
+/**
+ * Build a conflict detector for `doc`.
+ *
+ * Subscribes to `afterTransaction` and inspects `tr.changed`, which
+ * reports every key whose underlying struct list changed (independent of
+ * the head value). For each entry we resolve where in the tree the
+ * change happened and classify it into one of `ConflictKind`s.
+ */
+export function createConflictDetector(doc, options = {}) {
+    const windowMs = options.windowMs ?? 750;
+    const listeners = new Set();
+    const conflicts = [];
+    /** key = `${kind}|${path}|${field}` → recent writers. */
+    const recentWrites = new Map();
+    const flag = (info, writers) => {
+        const contributors = Array.from(new Set(writers.map((w) => w.client)));
+        if (contributors.length < 2)
+            return;
+        const event = {
+            kind: info.kind,
+            path: info.path,
+            field: info.field,
+            contributors,
+            detectedAt: Date.now(),
+        };
+        conflicts.push(event);
+        listeners.forEach((l) => l(event));
+    };
+    const record = (info, client) => {
+        if (client < 0)
+            return;
+        const key = `${info.kind}|${info.path}|${info.field ?? ''}`;
+        const now = Date.now();
+        const arr = (recentWrites.get(key) ?? []).filter((w) => now - w.at < windowMs);
+        arr.push({ client, at: now });
+        recentWrites.set(key, arr);
+        if (arr.length >= 2)
+            flag(info, arr);
+    };
+    const onAfterTransaction = (tr) => {
+        if (tr.changed.size === 0)
+            return;
+        const client = tr.local ? doc.clientID : guessRemoteClient(tr);
+        if (client < 0)
+            return;
+        for (const [type, keys] of tr.changed.entries()) {
+            const top = topLevelKey(type);
+            if (top !== TOP.ENTITIES && top !== TOP.RELATIONSHIPS && top !== TOP.GEOMETRY)
+                continue;
+            const path = pathFromTop(type);
+            if (!path)
+                continue;
+            for (const key of keys) {
+                // For top-level Y.Map changes the parent map's `has(key)` tells
+                // us whether this was a delete (key absent → yes) or an add.
+                // Only deletes count as conflict-inducing at the top level.
+                const isDelete = path.length === 0 && key != null && !type.has(key);
+                const info = classify(top, path, key, isDelete);
+                if (info)
+                    record(info, client);
+            }
+        }
+        const cutoff = Date.now() - windowMs * 4;
+        while (conflicts.length > 0 && conflicts[0].detectedAt < cutoff) {
+            conflicts.shift();
+        }
+    };
+    doc.on('afterTransaction', onAfterTransaction);
+    return {
+        onConflict(listener) {
+            listeners.add(listener);
+            return () => listeners.delete(listener);
+        },
+        active: () => [...conflicts],
+        destroy() {
+            doc.off('afterTransaction', onAfterTransaction);
+            listeners.clear();
+            conflicts.length = 0;
+            recentWrites.clear();
+        },
+    };
+}
+/**
+ * Resolve a changed Y.AbstractType's path from its top-level shared
+ * type as a list of keys/indices. Keys at intermediate levels are
+ * always strings — we only nest Y.Maps under named keys.
+ */
+function pathFromTop(type) {
+    const out = [];
+    let node = type;
+    while (node) {
+        const item = node._item;
+        if (!item)
+            break; // top-level
+        const parentSub = item.parentSub;
+        if (typeof parentSub !== 'string')
+            return null; // array-indexed nesting; unsupported here
+        out.unshift(parentSub);
+        node = item.parent;
+    }
+    return out;
+}
+function topLevelKey(type) {
+    let node = type;
+    while (node) {
+        const item = node._item;
+        if (!item) {
+            const doc = node.doc;
+            if (!doc)
+                return undefined;
+            for (const [name, shared] of doc.share) {
+                if (shared === node)
+                    return name;
+            }
+            return undefined;
+        }
+        node = item.parent;
+    }
+    return undefined;
+}
+/**
+ * Map a (top, path[], key) triple to a ConflictKind + path + field.
+ * `path` is the list of map keys descending from the top-level shared
+ * type to the changed AbstractType. `key` is the changed leaf key (or
+ * null for array-shaped changes). `isDelete` only matters at
+ * `path.length === 0` (top-level entity churn).
+ */
+function classify(top, path, key, isDelete) {
+    if (top === TOP.ENTITIES) {
+        if (path.length === 0) {
+            // Entity create OR delete on the top-level entities map. We only
+            // surface deletes — concurrent creates are CRDT-friendly (both
+            // entities coexist if they have different paths).
+            if (isDelete && key)
+                return { kind: 'concurrent-delete', path: key };
+            return null;
+        }
+        const entityPath = path[0];
+        if (path.length === 1) {
+            // Change on the entity Y.Map itself; sub-key is `key` (e.g. the
+            // attributes Y.Map being added/replaced). Not a leaf conflict.
+            return null;
+        }
+        const subMap = path[1];
+        if (path.length === 2) {
+            switch (subMap) {
+                case ENTITY_KEY.ATTRIBUTES:
+                    return key ? { kind: 'attribute', path: entityPath, field: key } : null;
+                case ENTITY_KEY.CHILDREN:
+                    return key ? { kind: 'hierarchy', path: entityPath, field: key } : null;
+                case ENTITY_KEY.PSETS:
+                    // A new (or replaced) Pset Y.Map at the entity level. Treat
+                    // the pset name as the field — useful when two peers seed the
+                    // same Pset concurrently.
+                    return key ? { kind: 'pset-property', path: entityPath, field: key } : null;
+                default:
+                    return null;
+            }
+        }
+        if (path.length === 3 && subMap === ENTITY_KEY.PSETS) {
+            const psetName = path[2];
+            return key
+                ? { kind: 'pset-property', path: entityPath, field: `${psetName}.${key}` }
+                : null;
+        }
+        return null;
+    }
+    if (top === TOP.GEOMETRY) {
+        if (path.length === 0) {
+            return null;
+        }
+        const geomId = path[0];
+        if (path.length === 1) {
+            // direct field on a geometry node
+            if (key === GEOMETRY_KEY.BLOB_HASH) {
+                return { kind: 'geometry-blob', path: geomId };
+            }
+            return null;
+        }
+        if (path.length === 2 && path[1] === GEOMETRY_KEY.PARAMS) {
+            return key ? { kind: 'geometry-param', path: geomId, field: key } : null;
+        }
+        return null;
+    }
+    if (top === TOP.RELATIONSHIPS) {
+        if (path.length === 0) {
+            return null;
+        }
+        const relPath = path[0];
+        if (path.length === 1 && key === RELATIONSHIP_KEY.TARGETS) {
+            return { kind: 'relationship-target', path: relPath };
+        }
+        // Targets array changes: the Y.Array is at path=[relPath, 'targets']
+        if (path.length === 2 && path[1] === RELATIONSHIP_KEY.TARGETS) {
+            return { kind: 'relationship-target', path: relPath };
+        }
+        return null;
+    }
+    return null;
+}
+/**
+ * Best-effort attribution of a remote transaction to a clientID.
+ *
+ * Yjs doesn't carry "the client that authored this transaction" directly;
+ * it carries per-struct clientIDs in the `afterState`/`beforeState`
+ * vectors. We pick the client whose clock advanced the furthest. Ties
+ * are rare and harmless — the conflict UI surfaces all contributors.
+ */
+function guessRemoteClient(tr) {
+    let bestClient = -1;
+    let bestDelta = 0;
+    for (const [client, after] of tr.afterState) {
+        const before = tr.beforeState.get(client) ?? 0;
+        const delta = after - before;
+        if (delta > bestDelta) {
+            bestDelta = delta;
+            bestClient = client;
+        }
+    }
+    return bestClient;
+}
+//# sourceMappingURL=detector.js.map

package/dist/conflicts/detector.js.map

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

package/dist/conflicts/index.d.ts

@@ -0,0 +1,3 @@
+export * from './detector.js';
+export * from './ui-bridge.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/conflicts/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/conflicts/index.ts"],"names":[],"mappings":"AAIA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC"}

package/dist/conflicts/index.js

@@ -0,0 +1,6 @@
+/* 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 * from './detector.js';
+export * from './ui-bridge.js';
+//# sourceMappingURL=index.js.map

package/dist/conflicts/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/conflicts/index.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC"}

package/dist/conflicts/ui-bridge.d.ts

@@ -0,0 +1,80 @@
+/**
+ * UI bridge for conflict surfacing (spec §9.7).
+ *
+ * The detector reports raw events at every concurrent write. The viewer
+ * (or any UI) needs:
+ *   - a stable list of currently-active conflicts grouped by entity path
+ *   - notifications when a conflict appears, ages out, or resolves
+ *   - a clean "resolve mine" / "accept theirs" handle that emits a
+ *     follow-up edit on resolution
+ *
+ * This module sits between the detector and the UI. It does NOT touch
+ * the CRDT — resolution is a normal write that the caller dispatches
+ * inside its own transaction.
+ */
+import type { ConflictDetector, ConflictEvent } from './detector.js';
+export type ConflictBucketKey = string;
+export interface ConflictBucket {
+    key: ConflictBucketKey;
+    /** Entity / relationship / geometry path involved. */
+    path: string;
+    /** Optional sub-path (e.g. attribute name). */
+    field?: string;
+    kind: ConflictEvent['kind'];
+    /** All clientIDs that wrote in the conflict window. */
+    contributors: Set<number>;
+    /** Wall-clock ms of the first event in the bucket. */
+    firstSeenAt: number;
+    /** Wall-clock ms of the most-recent event. */
+    lastSeenAt: number;
+    /** Number of detector events folded into this bucket. */
+    count: number;
+}
+export type BridgeEventType = 'open' | 'update' | 'close';
+export interface BridgeEvent {
+    type: BridgeEventType;
+    bucket: ConflictBucket;
+}
+export type BridgeListener = (event: BridgeEvent) => void;
+export interface ConflictUIBridgeOptions {
+    /** A bucket closes after this many ms with no new events (default 4_000). */
+    closeAfterMs?: number;
+}
+export interface ResolutionContext {
+    bucket: ConflictBucket;
+}
+export type ResolutionAction = (ctx: ResolutionContext) => void | Promise<void>;
+export interface ConflictUIBridge {
+    /** All currently-open buckets. */
+    active(): ConflictBucket[];
+    /** Subscribe to bucket lifecycle (open / update / close). */
+    on(listener: BridgeListener): () => void;
+    /**
+     * Mark a bucket resolved (close immediately). Useful when the UI
+     * dispatches a "keep mine" edit and wants the badge to disappear.
+     */
+    resolve(key: ConflictBucketKey): boolean;
+    /**
+     * Run the registered "keep mine" callback (if any) and close the
+     * bucket. Apps register the callback per kind via `onKeepMine`. The
+     * callback is responsible for emitting the follow-up CRDT edit that
+     * re-asserts the local user's value.
+     */
+    keepMine(key: ConflictBucketKey): Promise<boolean>;
+    /** Same shape as `keepMine`, but for "accept theirs". */
+    acceptTheirs(key: ConflictBucketKey): Promise<boolean>;
+    /** Register a "keep mine" handler for a given conflict kind. */
+    onKeepMine(kind: ConflictBucket['kind'], action: ResolutionAction): () => void;
+    /** Register an "accept theirs" handler for a given conflict kind. */
+    onAcceptTheirs(kind: ConflictBucket['kind'], action: ResolutionAction): () => void;
+    destroy(): void;
+}
+/**
+ * Build a UI bridge subscribed to `detector`.
+ *
+ * Each `(kind, path, field)` triple maps to one bucket. A new event
+ * folded into an existing bucket emits `update`; a new triple emits
+ * `open`; an idle timeout or explicit `resolve()` emits `close`.
+ */
+export declare function createConflictUIBridge(detector: ConflictDetector, opts?: ConflictUIBridgeOptions): ConflictUIBridge;
+//# sourceMappingURL=ui-bridge.d.ts.map