@unbrained/pm-cli 2026.9.6 → 2026.9.8

package/dist/sdk/merge/three-way.js

@@ -1,776 +1,4 @@
-/**
- * @module sdk/merge/three-way
- *
- * Field-aware three-way merge primitives for every mergeable tracker artifact
- * class: append-only history JSONL streams, item documents (TOON or
- * JSON+Markdown), and key-level JSON configuration/schema files. These
- * primitives are pure (content in, content out) so the CLI merge driver, the
- * MCP surface, and package integrations all share one merge semantics
- * definition for multi-branch agent workflows.
- */
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="4d5434c7-544b-5061-89eb-6e4074e58e30")}catch(e){}}();
-import { historyEntriesToRaw, reanchorHistoryEntries, } from "../../core/history/replay.js";
-import { canonicalDocument, parseItemDocument, serializeItemDocument, } from "../../core/item/item-format.js";
-import { splitAcceptanceCriteria } from "../../core/item/parse.js";
-import { EXIT_CODE } from "../../core/shared/constants.js";
-import { findFirstMergeConflictMarker } from "../../core/shared/conflict-markers.js";
-import { PmCliError } from "../../core/shared/errors.js";
-import { sha256Hex, stableStringify } from "../../core/shared/serialization.js";
-import { compareTimestampStrings } from "../../core/shared/time.js";
-/** JSON-stable marker used when a conflict decision refers to an absent scalar. */
-export const ITEM_SCALAR_MISSING_VALUE = Object.freeze({
-    pm_item_scalar_missing: true,
-});
-/** Return whether receipt evidence represents an absent item scalar. */
-export function isItemScalarMissingValue(value) {
-    return (typeof value === "object" &&
-        value !== null &&
-        !Array.isArray(value) &&
-        Object.keys(value).length === 1 &&
-        value.pm_item_scalar_missing === true);
-}
-/** Encode an absent scalar so every decision property survives JSON serialization. */
-export function encodeItemScalarDecisionValue(value) {
-    return value === undefined ? ITEM_SCALAR_MISSING_VALUE : value;
-}
-/** Hash scalars in disjoint present/missing domains for collision-free evidence. */
-export function hashItemScalarDecisionValue(value) {
-    return sha256Hex(stableStringify(value === undefined
-        ? { pm_item_scalar_presence: "missing" }
-        : { pm_item_scalar_presence: "present", value }));
-}
-function parseHistoryJsonl(raw, label) {
-    const conflictMarker = findFirstMergeConflictMarker(raw);
-    if (conflictMarker) {
-        throw new PmCliError(`History merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`, EXIT_CODE.GENERIC_FAILURE);
-    }
-    const entries = [];
-    for (const [index, rawLine] of raw.split(/\r?\n/).entries()) {
-        const line = rawLine.trim();
-        if (!line) {
-            continue;
-        }
-        try {
-            const parsed = JSON.parse(line);
-            if (typeof parsed !== "object" ||
-                parsed === null ||
-                Array.isArray(parsed)) {
-                throw new TypeError("history entry must be an object");
-            }
-            entries.push(parsed);
-        }
-        catch {
-            throw new PmCliError(`History merge input (${label}) contains invalid JSON at line ${index + 1}.`, EXIT_CODE.GENERIC_FAILURE);
-        }
-    }
-    return entries;
-}
-function historyEntryIdentity(entry) {
-    return stableStringify({
-        ts: entry.ts,
-        author: entry.author,
-        op: entry.op,
-        patch: entry.patch,
-        message: entry.message ?? null,
-    });
-}
-function commonHistoryPrefixLength(ours, theirs) {
-    const limit = Math.min(ours.length, theirs.length);
-    let shared = 0;
-    while (shared < limit &&
-        historyEntryIdentity(ours[shared]) === historyEntryIdentity(theirs[shared])) {
-        shared += 1;
-    }
-    return shared;
-}
-/**
- * Deterministically merge two diverged versions of one append-only history
- * JSONL stream. Identical streams and one-sided fast-forwards keep the winning
- * side byte-for-byte; genuinely diverged streams are merged as the shared
- * prefix plus both suffixes ordered by timestamp (ours-first on ties), then
- * hash re-anchored so the resulting chain verifies again. No side's events are
- * ever discarded: content divergence is preserved for the post-merge
- * reconciliation pass (`pm validate` + `pm history-repair`) instead of being
- * silently resolved by last-writer-wins. If either suffix cannot apply after
- * deterministic ordering, the merge fails closed instead of publishing a
- * hash-valid stream that omitted a branch effect.
- */
-export function mergeHistoryStreams(baseRaw, oursRaw, theirsRaw) {
-    parseHistoryJsonl(baseRaw, "base");
-    const ours = parseHistoryJsonl(oursRaw, "ours");
-    const theirs = parseHistoryJsonl(theirsRaw, "theirs");
-    const shared = commonHistoryPrefixLength(ours, theirs);
-    if (shared === ours.length && shared === theirs.length) {
-        return {
-            merged: historyEntriesToRaw(ours),
-            strategy: "identical",
-            common_entries: shared,
-            entries_from_ours: 0,
-            entries_from_theirs: 0,
-            entries_total: ours.length,
-            reanchored: false,
-        };
-    }
-    if (shared === theirs.length) {
-        return {
-            merged: historyEntriesToRaw(ours),
-            strategy: "fast_forward_ours",
-            common_entries: shared,
-            entries_from_ours: ours.length - shared,
-            entries_from_theirs: 0,
-            entries_total: ours.length,
-            reanchored: false,
-        };
-    }
-    if (shared === ours.length) {
-        return {
-            merged: historyEntriesToRaw(theirs),
-            strategy: "fast_forward_theirs",
-            common_entries: shared,
-            entries_from_ours: 0,
-            entries_from_theirs: theirs.length - shared,
-            entries_total: theirs.length,
-            reanchored: false,
-        };
-    }
-    const oursSuffix = ours.slice(shared);
-    const seenIdentities = new Set(oursSuffix.map(historyEntryIdentity));
-    const theirsSuffix = theirs
-        .slice(shared)
-        .filter((entry) => !seenIdentities.has(historyEntryIdentity(entry)));
-    const mergedSuffix = [...oursSuffix, ...theirsSuffix].sort((left, right) => {
-        const byTs = compareTimestampStrings(left.ts, right.ts);
-        if (byTs !== 0) {
-            return byTs;
-        }
-        const leftFromOurs = seenIdentities.has(historyEntryIdentity(left));
-        const rightFromOurs = seenIdentities.has(historyEntryIdentity(right));
-        if (leftFromOurs !== rightFromOurs) {
-            return Number(rightFromOurs) - Number(leftFromOurs);
-        }
-        return historyEntryIdentity(left).localeCompare(historyEntryIdentity(right));
-    });
-    const reanchored = reanchorHistoryEntries([...ours.slice(0, shared), ...mergedSuffix], undefined, { continuousHashSurface: true });
-    if (reanchored.skippedOps > 0) {
-        throw new PmCliError(`History union cannot preserve ${reanchored.skippedOps} patch operation(s) after deterministic suffix ordering; leave the file unresolved for manual recovery.`, EXIT_CODE.GENERIC_FAILURE);
-    }
-    return {
-        merged: historyEntriesToRaw(reanchored.entries),
-        strategy: "union_reanchor",
-        common_entries: shared,
-        entries_from_ours: oursSuffix.length,
-        entries_from_theirs: theirsSuffix.length,
-        entries_total: reanchored.entries.length,
-        reanchored: true,
-    };
-}
-function parseRelationshipJsonl(raw, label) {
-    const conflictMarker = findFirstMergeConflictMarker(raw);
-    if (conflictMarker) {
-        throw new PmCliError(`Relationship merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`, EXIT_CODE.GENERIC_FAILURE);
-    }
-    const events = [];
-    for (const [index, rawLine] of raw.split(/\r?\n/).entries()) {
-        const line = rawLine.trim();
-        if (!line) {
-            continue;
-        }
-        let parsed;
-        try {
-            parsed = JSON.parse(line);
-        }
-        catch {
-            throw new PmCliError(`Relationship merge input (${label}) contains invalid JSON at line ${index + 1}.`, EXIT_CODE.GENERIC_FAILURE);
-        }
-        if (typeof parsed !== "object" ||
-            parsed === null ||
-            Array.isArray(parsed) ||
-            typeof parsed.eventId !== "string" ||
-            typeof parsed.sequence !== "number") {
-            throw new PmCliError(`Relationship merge input (${label}) line ${index + 1} is not a relationship event (eventId + sequence required).`, EXIT_CODE.GENERIC_FAILURE);
-        }
-        events.push(parsed);
-    }
-    return events;
-}
-function relationshipEventsToRaw(events) {
-    return events.length === 0
-        ? ""
-        : `${events.map((event) => JSON.stringify(event)).join("\n")}\n`;
-}
-function renumberRelationshipEvents(events) {
-    return events.map((event, index) => ({ ...event, sequence: index + 1 }));
-}
-/**
- * Deterministically merge two diverged versions of one append-only
- * relationship event JSONL store. The store's loader enforces strictly
- * consecutive one-based `sequence` values, so a plain text union of two
- * diverged streams is always unreadable; this merge keeps the shared prefix,
- * unions both divergent suffixes by `eventId` (ordered by event timestamp,
- * ours-first on ties), and renumbers every merged sequence consecutively so
- * the resulting stream loads again. No side's events are ever discarded.
- */
-export function mergeRelationshipEventStreams(baseRaw, oursRaw, theirsRaw) {
-    parseRelationshipJsonl(baseRaw, "base");
-    const ours = parseRelationshipJsonl(oursRaw, "ours");
-    const theirs = parseRelationshipJsonl(theirsRaw, "theirs");
-    const limit = Math.min(ours.length, theirs.length);
-    let shared = 0;
-    while (shared < limit && ours[shared].eventId === theirs[shared].eventId) {
-        shared += 1;
-    }
-    if (shared === ours.length && shared === theirs.length) {
-        return {
-            merged: relationshipEventsToRaw(ours),
-            strategy: "identical",
-            common_entries: shared,
-            entries_from_ours: 0,
-            entries_from_theirs: 0,
-            entries_total: ours.length,
-            reanchored: false,
-        };
-    }
-    if (shared === theirs.length) {
-        return {
-            merged: relationshipEventsToRaw(ours),
-            strategy: "fast_forward_ours",
-            common_entries: shared,
-            entries_from_ours: ours.length - shared,
-            entries_from_theirs: 0,
-            entries_total: ours.length,
-            reanchored: false,
-        };
-    }
-    if (shared === ours.length) {
-        return {
-            merged: relationshipEventsToRaw(theirs),
-            strategy: "fast_forward_theirs",
-            common_entries: shared,
-            entries_from_ours: 0,
-            entries_from_theirs: theirs.length - shared,
-            entries_total: theirs.length,
-            reanchored: false,
-        };
-    }
-    const oursSuffix = ours.slice(shared);
-    const oursEventIds = new Set(oursSuffix.map((event) => event.eventId));
-    const theirsSuffix = theirs
-        .slice(shared)
-        .filter((event) => !oursEventIds.has(event.eventId));
-    const mergedSuffix = [...oursSuffix, ...theirsSuffix].sort((left, right) => {
-        if (left.timestamp !== undefined && right.timestamp !== undefined) {
-            const byTs = compareTimestampStrings(left.timestamp, right.timestamp);
-            if (byTs !== 0) {
-                return byTs;
-            }
-        }
-        else if (left.timestamp === undefined && right.timestamp !== undefined) {
-            return 1;
-        }
-        else if (left.timestamp !== undefined) {
-            return -1;
-        }
-        const leftFromOurs = oursEventIds.has(left.eventId);
-        const rightFromOurs = oursEventIds.has(right.eventId);
-        if (leftFromOurs !== rightFromOurs) {
-            return Number(rightFromOurs) - Number(leftFromOurs);
-        }
-        // Array.prototype.sort is stable: returning zero preserves each side's
-        // original append order when its events share a timestamp.
-        return 0;
-    });
-    const merged = renumberRelationshipEvents([
-        ...ours.slice(0, shared),
-        ...mergedSuffix,
-    ]);
-    return {
-        merged: relationshipEventsToRaw(merged),
-        strategy: "union_reanchor",
-        common_entries: shared,
-        entries_from_ours: oursSuffix.length,
-        entries_from_theirs: theirsSuffix.length,
-        entries_total: merged.length,
-        reanchored: true,
-    };
-}
-/**
- * Item metadata collections merged by element-identity set semantics instead
- * of whole-field three-way comparison: concurrent commutative appends from two
- * branches (notes on A, tags on B, a test run on each) must merge cleanly.
- * Element identity is the stable serialization of the normalized element, so
- * an element edited on one side counts as remove-old + add-new and both sides'
- * contributions survive. Plan collections are deliberately excluded: plan
- * steps carry cross-element ordering invariants that set-union would corrupt,
- * so they stay under scalar three-way semantics with explicit conflicts.
- */
-export const ITEM_UNION_COLLECTION_FIELDS = [
-    "tags",
-    "dependencies",
-    "comments",
-    "notes",
-    "learnings",
-    "files",
-    "tests",
-    "test_runs",
-    "docs",
-    "reminders",
-    "events",
-];
-/** Delimiter-backed list fields that use the same lossless element merge as native metadata collections while retaining their legacy scalar storage shape. */
-const ITEM_UNION_DELIMITED_FIELDS = ["acceptance_criteria"];
-/** Item metadata fields resolved by deterministic latest-timestamp-wins instead of three-way conflict, so disjoint-field edits never conflict on the shared freshness scalar every mutation rewrites. */
-export const ITEM_LATEST_TIMESTAMP_FIELDS = ["updated_at"];
-function jsonEquals(left, right) {
-    if (left === undefined || right === undefined) {
-        return left === undefined && right === undefined;
-    }
-    return stableStringify(left) === stableStringify(right);
-}
-function unionCollection(base, ours, theirs) {
-    const toEntries = (value) => Array.isArray(value) ? value : [];
-    const baseIds = new Set(toEntries(base).map((entry) => stableStringify(entry)));
-    const oursEntries = toEntries(ours);
-    const oursIds = new Set(oursEntries.map((entry) => stableStringify(entry)));
-    const theirsEntries = toEntries(theirs);
-    const theirsIds = new Set(theirsEntries.map((entry) => stableStringify(entry)));
-    const merged = oursEntries.filter((entry) => {
-        const identity = stableStringify(entry);
-        // An element kept by ours survives unless theirs deleted it (present in
-        // base, absent from theirs).
-        return !baseIds.has(identity) || theirsIds.has(identity);
-    });
-    for (const entry of theirsEntries) {
-        const identity = stableStringify(entry);
-        if (!oursIds.has(identity) && !baseIds.has(identity)) {
-            merged.push(entry);
-        }
-    }
-    return merged;
-}
-function linkedTestDefinitionIdentity(value) {
-    /* c8 ignore start -- canonical item parsing normalizes linked-test entries to object records */
-    if (typeof value !== "object" || value === null || Array.isArray(value)) {
-        return stableStringify(value);
-    }
-    /* c8 ignore stop */
-    const { provenance: _provenance, ...definition } = value;
-    return stableStringify(definition);
-}
-function markMergedLinkedTest(value) {
-    /* c8 ignore start -- canonical item parsing normalizes linked-test entries to object records */
-    if (typeof value !== "object" || value === null || Array.isArray(value)) {
-        return value;
-    }
-    /* c8 ignore stop */
-    const test = value;
-    if (!test.provenance) {
-        return {
-            ...test,
-            // Legacy entries contributed by another branch must not regain implicit
-            // local trust. This incomplete merge marker is preserved by normalization
-            // and refused until an operator acknowledges it in the receiving clone.
-            provenance: { source_kind: "merge_union" },
-        };
-    }
-    return {
-        ...test,
-        provenance: {
-            ...test.provenance,
-            source_kind: "merge_union",
-        },
-    };
-}
-function unionLinkedTests(base, ours, theirs) {
-    const toEntries = (value) => Array.isArray(value) ? value : [];
-    const baseIds = new Set(toEntries(base).map(linkedTestDefinitionIdentity));
-    const oursEntries = toEntries(ours);
-    const oursIds = new Set(oursEntries.map(linkedTestDefinitionIdentity));
-    const theirsEntries = toEntries(theirs);
-    const theirsIds = new Set(theirsEntries.map(linkedTestDefinitionIdentity));
-    const merged = oursEntries.filter((entry) => {
-        const identity = linkedTestDefinitionIdentity(entry);
-        return !baseIds.has(identity) || theirsIds.has(identity);
-    });
-    for (const entry of theirsEntries) {
-        const identity = linkedTestDefinitionIdentity(entry);
-        if (!oursIds.has(identity) && !baseIds.has(identity)) {
-            merged.push(markMergedLinkedTest(entry));
-        }
-    }
-    return merged;
-}
-function latestTimestamp(ours, theirs) {
-    return compareTimestampStrings(String(ours), String(theirs)) >= 0
-        ? ours
-        : theirs;
-}
-function mergeScalarThreeWay(base, ours, theirs, preferred) {
-    if (jsonEquals(ours, theirs)) {
-        return { value: ours, from_theirs: false, conflict: false };
-    }
-    if (jsonEquals(base, ours)) {
-        return { value: theirs, from_theirs: true, conflict: false };
-    }
-    if (jsonEquals(base, theirs)) {
-        return { value: ours, from_theirs: false, conflict: false };
-    }
-    return {
-        value: preferred === "theirs" ? theirs : ours,
-        from_theirs: preferred === "theirs",
-        conflict: true,
-    };
-}
-/** Resolve one item scalar with explicit recency and deterministic tie evidence. */
-function mergeItemScalarThreeWay(base, ours, theirs, preferred, conflictResolution, oursUpdatedAt, theirsUpdatedAt) {
-    const outcome = mergeScalarThreeWay(base, ours, theirs, preferred);
-    if (!outcome.conflict) {
-        return { ...outcome, conflict: false };
-    }
-    if (conflictResolution === "preferred_side") {
-        return {
-            ...outcome,
-            resolution_basis: "requested_preference",
-            retained_side: outcome.from_theirs ? "theirs" : "ours",
-        };
-    }
-    const timestampOrder = compareTimestampStrings(oursUpdatedAt, theirsUpdatedAt);
-    if (conflictResolution === "latest_document_update" && timestampOrder !== 0) {
-        const retainTheirs = timestampOrder < 0;
-        return {
-            value: retainTheirs ? theirs : ours,
-            from_theirs: retainTheirs,
-            conflict: true,
-            resolution_basis: "document_updated_at",
-            retained_side: retainTheirs ? "theirs" : "ours",
-        };
-    }
-    const retainTheirs = stableStringify(encodeItemScalarDecisionValue(theirs)).localeCompare(stableStringify(encodeItemScalarDecisionValue(ours))) < 0;
-    return {
-        value: retainTheirs ? theirs : ours,
-        from_theirs: retainTheirs,
-        conflict: true,
-        resolution_basis: "stable_value_tiebreak",
-        retained_side: retainTheirs ? "theirs" : "ours",
-    };
-}
-function toMetadataRecord(document) {
-    return { ...document.metadata };
-}
-/** Parse one merge side and reject values reserved for internal absence evidence. */
-function parseItemMergeSide(raw, label, options) {
-    try {
-        const document = canonicalDocument(parseItemDocument(raw, options), options);
-        const reservedField = Object.entries(document.metadata).find(([, value]) => isItemScalarMissingValue(value))?.[0];
-        if (reservedField !== undefined) {
-            throw new TypeError(`metadata field ${reservedField} uses the reserved missing-scalar evidence marker`);
-        }
-        return document;
-    }
-    catch (error) {
-        throw new PmCliError(`Item merge input (${label}) is not a readable item document: ${String(error)}`, EXIT_CODE.GENERIC_FAILURE);
-    }
-}
-/** Merge one collection field and report whether the field was handled. */
-function mergeItemUnionField(params) {
-    if (!params.unionFieldSet.has(params.field))
-        return false;
-    const union = params.field === "tests"
-        ? unionLinkedTests(params.baseValue, params.oursValue, params.theirsValue)
-        : params.field === "acceptance_criteria"
-            ? unionCollection(splitAcceptanceCriteria(params.baseValue), splitAcceptanceCriteria(params.oursValue), splitAcceptanceCriteria(params.theirsValue)).join("; ")
-            : unionCollection(params.baseValue, params.oursValue, params.theirsValue);
-    params.accumulator.merged[params.field] = union;
-    if (!jsonEquals(union, params.oursValue)) {
-        params.accumulator.unionFields.push(params.field);
-    }
-    return true;
-}
-/** Merge one scalar field while preserving conflict evidence. */
-function mergeItemScalarField(params) {
-    const outcome = mergeItemScalarThreeWay(params.baseValue, params.oursValue, params.theirsValue, params.preferred, params.conflictResolution, params.oursUpdatedAt, params.theirsUpdatedAt);
-    if (outcome.value !== undefined) {
-        params.accumulator.merged[params.field] = outcome.value;
-    }
-    if (outcome.conflict) {
-        params.accumulator.conflictFields.push(params.field);
-        params.accumulator.conflictDecisions.push({
-            field: params.field,
-            base: encodeItemScalarDecisionValue(params.baseValue),
-            ours: encodeItemScalarDecisionValue(params.oursValue),
-            theirs: encodeItemScalarDecisionValue(params.theirsValue),
-            retained: encodeItemScalarDecisionValue(outcome.value),
-            discarded: encodeItemScalarDecisionValue(outcome.from_theirs ? params.oursValue : params.theirsValue),
-            retained_side: outcome.retained_side,
-            resolution_basis: outcome.resolution_basis,
-        });
-    }
-    else if (outcome.from_theirs) {
-        params.accumulator.fieldsFromTheirs.push(params.field);
-    }
-}
-function mergeItemMetadataRecords(baseRecord, oursRecord, theirsRecord, preferred, conflictResolution, oursUpdatedAt, theirsUpdatedAt) {
-    const unionFieldSet = new Set([
-        ...ITEM_UNION_COLLECTION_FIELDS,
-        ...ITEM_UNION_DELIMITED_FIELDS,
-    ]);
-    const latestFieldSet = new Set(ITEM_LATEST_TIMESTAMP_FIELDS);
-    const fieldNames = [
-        ...new Set([...Object.keys(oursRecord), ...Object.keys(theirsRecord)]),
-    ].sort((left, right) => left.localeCompare(right));
-    const accumulator = {
-        merged: {},
-        conflictFields: [],
-        fieldsFromTheirs: [],
-        unionFields: [],
-        conflictDecisions: [],
-    };
-    for (const field of fieldNames) {
-        const baseValue = baseRecord[field];
-        const oursValue = oursRecord[field];
-        const theirsValue = theirsRecord[field];
-        if (mergeItemUnionField({
-            field,
-            baseValue,
-            oursValue,
-            theirsValue,
-            unionFieldSet,
-            accumulator,
-        })) {
-            // `fieldNames` is derived from both records' own keys, so a collection
-            // reached here is declared by at least one side. Preserve even an empty
-            // result (`tags` is required) so serialization never drops it.
-            continue;
-        }
-        if (latestFieldSet.has(field)) {
-            accumulator.merged[field] = latestTimestamp(oursValue, theirsValue);
-            continue;
-        }
-        mergeItemScalarField({
-            field,
-            baseValue,
-            oursValue,
-            theirsValue,
-            preferred,
-            conflictResolution,
-            oursUpdatedAt,
-            theirsUpdatedAt,
-            accumulator,
-        });
-    }
-    return accumulator;
-}
-/**
- * Field-aware three-way merge of one tracker item document. Commutative
- * collections (notes, tags, tests, ...) union by element identity so
- * concurrent appends never conflict; `updated_at` resolves to the latest
- * timestamp so disjoint-field edits never collide on the shared freshness
- * scalar; every other metadata field and the body use classic three-way
- * resolution. Unresolvable both-sides-changed conflicts use the configured
- * scalar policy but remain reported in `conflict_fields`, and the merged output
- * is always canonically serialized — count-prefixed TOON array headers are
- * recomputed, so the hand-resolution corruption class (stale `notes[N]`
- * headers) cannot be produced by this merge.
- */
-export function mergeItemDocuments(baseRaw, oursRaw, theirsRaw, options = {}) {
-    const preferred = options.preferred ?? "ours";
-    const conflictResolution = options.conflictResolution ?? "preferred_side";
-    // An empty base means both branches created the file independently
-    // (add/add); three-way falls back to treating every differing field as an
-    // ours/theirs decision, which the scalar resolver already models.
-    const hasBase = baseRaw.trim().length > 0;
-    const ours = parseItemMergeSide(oursRaw, "ours", options);
-    const theirs = parseItemMergeSide(theirsRaw, "theirs", options);
-    const base = hasBase ? parseItemMergeSide(baseRaw, "base", options) : ours;
-    const baseRecord = hasBase
-        ? toMetadataRecord(base)
-        : {};
-    const oursRecord = toMetadataRecord(ours);
-    const theirsRecord = toMetadataRecord(theirs);
-    const { merged, conflictFields, fieldsFromTheirs, unionFields, conflictDecisions, } = mergeItemMetadataRecords(baseRecord, oursRecord, theirsRecord, preferred, conflictResolution, ours.metadata.updated_at, theirs.metadata.updated_at);
-    const bodyOutcome = mergeItemScalarThreeWay(hasBase ? base.body : "", ours.body, theirs.body, preferred, conflictResolution, ours.metadata.updated_at, theirs.metadata.updated_at);
-    if (bodyOutcome.conflict) {
-        conflictFields.push("body");
-        conflictDecisions.push({
-            field: "body",
-            base: encodeItemScalarDecisionValue(hasBase ? base.body : ""),
-            ours: encodeItemScalarDecisionValue(ours.body),
-            theirs: encodeItemScalarDecisionValue(theirs.body),
-            retained: encodeItemScalarDecisionValue(bodyOutcome.value),
-            discarded: encodeItemScalarDecisionValue(bodyOutcome.from_theirs ? ours.body : theirs.body),
-            retained_side: bodyOutcome.retained_side,
-            resolution_basis: bodyOutcome.resolution_basis,
-        });
-    }
-    else if (bodyOutcome.from_theirs) {
-        fieldsFromTheirs.push("body");
-    }
-    const mergedRaw = serializeItemDocument({
-        metadata: merged,
-        body: bodyOutcome.value,
-    }, options);
-    return {
-        merged: mergedRaw,
-        conflict_fields: conflictFields,
-        fields_from_theirs: fieldsFromTheirs,
-        union_fields: unionFields,
-        conflict_decisions: conflictDecisions,
-        requested_preference: preferred,
-        requested_preference_applied: conflictResolution === "preferred_side",
-        conflict_resolution: conflictResolution,
-    };
-}
-function isPlainObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function parseJsonSide(raw, label) {
-    const conflictMarker = findFirstMergeConflictMarker(raw);
-    if (conflictMarker) {
-        throw new PmCliError(`JSON merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}.`, EXIT_CODE.GENERIC_FAILURE);
-    }
-    if (raw.trim().length === 0) {
-        return undefined;
-    }
-    try {
-        return JSON.parse(raw);
-    }
-    catch {
-        throw new PmCliError(`JSON merge input (${label}) is not valid JSON.`, EXIT_CODE.GENERIC_FAILURE);
-    }
-}
-function mergeAdditiveJsonArrays(base, ours, theirs) {
-    if (!Array.isArray(base) || !Array.isArray(ours) || !Array.isArray(theirs)) {
-        return null;
-    }
-    const countEntries = (entries) => {
-        const counts = new Map();
-        for (const entry of entries) {
-            const identity = stableStringify(entry);
-            counts.set(identity, (counts.get(identity) ?? 0) + 1);
-        }
-        return counts;
-    };
-    const baseCounts = countEntries(base);
-    const oursCounts = countEntries(ours);
-    const theirsCounts = countEntries(theirs);
-    for (const [identity, baseCount] of baseCounts) {
-        if ((oursCounts.get(identity) ?? 0) < baseCount ||
-            (theirsCounts.get(identity) ?? 0) < baseCount) {
-            return null;
-        }
-    }
-    const unmatchedOursCounts = new Map(oursCounts);
-    const additionsFromTheirs = [];
-    for (const entry of theirs) {
-        const identity = stableStringify(entry);
-        const unmatchedOursCount = unmatchedOursCounts.get(identity) ?? 0;
-        if (unmatchedOursCount > 0) {
-            unmatchedOursCounts.set(identity, unmatchedOursCount - 1);
-        }
-        else {
-            additionsFromTheirs.push(entry);
-        }
-    }
-    return {
-        merged: [...ours, ...additionsFromTheirs],
-        acceptedTheirs: additionsFromTheirs.length > 0,
-    };
-}
-function mergeJsonObjects(base, ours, theirs, preferred, pathPrefix, conflictPaths, pathsFromTheirs) {
-    if (!isPlainObject(ours) || !isPlainObject(theirs)) {
-        return null;
-    }
-    const baseObject = isPlainObject(base) ? base : {};
-    const merged = {};
-    const keys = [
-        ...new Set([...Object.keys(ours), ...Object.keys(theirs)]),
-    ].sort((left, right) => left.localeCompare(right));
-    for (const key of keys) {
-        const childPath = pathPrefix.length > 0 ? `${pathPrefix}.${key}` : key;
-        const child = mergeJsonKey(baseObject, ours, theirs, key, preferred, childPath, conflictPaths, pathsFromTheirs);
-        if (child !== undefined) {
-            merged[key] = child;
-        }
-    }
-    return merged;
-}
-function mergeJsonValue(base, ours, theirs, preferred, pathPrefix, conflictPaths, pathsFromTheirs) {
-    if (jsonEquals(ours, theirs)) {
-        return ours;
-    }
-    const additiveArrayMerge = mergeAdditiveJsonArrays(base, ours, theirs);
-    if (additiveArrayMerge !== null) {
-        if (additiveArrayMerge.acceptedTheirs) {
-            pathsFromTheirs.push(pathPrefix);
-        }
-        return additiveArrayMerge.merged;
-    }
-    const mergedObject = mergeJsonObjects(base, ours, theirs, preferred, pathPrefix, conflictPaths, pathsFromTheirs);
-    if (mergedObject !== null) {
-        return mergedObject;
-    }
-    const outcome = mergeScalarThreeWay(base, ours, theirs, preferred);
-    if (outcome.conflict) {
-        conflictPaths.push(pathPrefix);
-    }
-    else if (outcome.from_theirs) {
-        pathsFromTheirs.push(pathPrefix);
-    }
-    return outcome.value;
-}
-function mergeJsonKey(base, ours, theirs, key, preferred, childPath, conflictPaths, pathsFromTheirs) {
-    const inOurs = Object.prototype.hasOwnProperty.call(ours, key);
-    const inTheirs = Object.prototype.hasOwnProperty.call(theirs, key);
-    const inBase = Object.prototype.hasOwnProperty.call(base, key);
-    if (inOurs && inTheirs) {
-        return mergeJsonValue(base[key], ours[key], theirs[key], preferred, childPath, conflictPaths, pathsFromTheirs);
-    }
-    if (inOurs) {
-        // Present only in ours: either ours added it (keep) or theirs deleted it
-        // (honor the delete when ours left it untouched from base).
-        if (inBase && jsonEquals(base[key], ours[key])) {
-            pathsFromTheirs.push(childPath);
-            return undefined;
-        }
-        if (inBase) {
-            conflictPaths.push(childPath);
-            return preferred === "theirs" ? undefined : ours[key];
-        }
-        return ours[key];
-    }
-    // Present only in theirs (mirror of the branch above).
-    if (inBase && jsonEquals(base[key], theirs[key])) {
-        return undefined;
-    }
-    if (inBase) {
-        conflictPaths.push(childPath);
-        return preferred === "theirs" ? theirs[key] : undefined;
-    }
-    pathsFromTheirs.push(childPath);
-    return theirs[key];
-}
-/**
- * Key-level three-way merge for the tracker's JSON configuration artifacts.
- * Nested objects merge recursively per key, while arrays compose only when
- * both branches preserve every base element and contribute additive entries.
- * Removals or edits retain scalar three-way conflict semantics. The output is
- * always valid JSON, so merged configuration cannot regress into the
- * silent-defaults fallback that raw conflict markers cause.
- */
-export function mergeJsonDocuments(baseRaw, oursRaw, theirsRaw, options = {}) {
-    const preferred = options.preferred ?? "ours";
-    const base = parseJsonSide(baseRaw, "base");
-    const ours = parseJsonSide(oursRaw, "ours");
-    const theirs = parseJsonSide(theirsRaw, "theirs");
-    const conflictPaths = [];
-    const pathsFromTheirs = [];
-    const merged = mergeJsonValue(base, ours, theirs, preferred, "", conflictPaths, pathsFromTheirs);
-    return {
-        merged: `${JSON.stringify(merged ?? null, null, 2)}\n`,
-        conflict_paths: conflictPaths,
-        paths_from_theirs: pathsFromTheirs,
-        preferred,
-    };
-}
+!(function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=new e.Error().stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c7f975a2-1793-5989-a7bb-b23705b623d0")}catch(e2){}})();import{historyEntriesToRaw,reanchorHistoryEntries}from"../../core/history/replay.js";import{canonicalDocument,parseItemDocument,serializeItemDocument}from"../../core/item/item-format.js";import{splitAcceptanceCriteria}from"../../core/item/parse.js";import{EXIT_CODE}from"../../core/shared/constants.js";import{findFirstMergeConflictMarker}from"../../core/shared/conflict-markers.js";import{PmCliError}from"../../core/shared/errors.js";import{sha256Hex,stableStringify}from"../../core/shared/serialization.js";import{compareTimestampStrings}from"../../core/shared/time.js";const ITEM_SCALAR_MISSING_VALUE=Object.freeze({pm_item_scalar_missing:true});function isItemScalarMissingValue(value){return typeof value==="object"&&value!==null&&!Array.isArray(value)&&Object.keys(value).length===1&&value.pm_item_scalar_missing===true}function encodeItemScalarDecisionValue(value){return value===void 0?ITEM_SCALAR_MISSING_VALUE:value}function hashItemScalarDecisionValue(value){return sha256Hex(stableStringify(value===void 0?{pm_item_scalar_presence:"missing"}:{pm_item_scalar_presence:"present",value}))}function parseHistoryJsonl(raw,label){const conflictMarker=findFirstMergeConflictMarker(raw);if(conflictMarker){throw new PmCliError(`History merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`,EXIT_CODE.GENERIC_FAILURE)}const entries=[];for(const[index,rawLine]of raw.split(/\r?\n/).entries()){const line=rawLine.trim();if(!line){continue}try{const parsed=JSON.parse(line);if(typeof parsed!=="object"||parsed===null||Array.isArray(parsed)){throw new TypeError("history entry must be an object")}entries.push(parsed)}catch{throw new PmCliError(`History merge input (${label}) contains invalid JSON at line ${index+1}.`,EXIT_CODE.GENERIC_FAILURE)}}return entries}function historyEntryIdentity(entry){return stableStringify({ts:entry.ts,author:entry.author,op:entry.op,patch:entry.patch,message:entry.message??null})}function commonHistoryPrefixLength(ours,theirs){const limit=Math.min(ours.length,theirs.length);let shared=0;while(shared<limit&&historyEntryIdentity(ours[shared])===historyEntryIdentity(theirs[shared])){shared+=1}return shared}function mergeHistoryStreams(baseRaw,oursRaw,theirsRaw){parseHistoryJsonl(baseRaw,"base");const ours=parseHistoryJsonl(oursRaw,"ours");const theirs=parseHistoryJsonl(theirsRaw,"theirs");const shared=commonHistoryPrefixLength(ours,theirs);if(shared===ours.length&&shared===theirs.length){return{merged:historyEntriesToRaw(ours),strategy:"identical",common_entries:shared,entries_from_ours:0,entries_from_theirs:0,entries_total:ours.length,reanchored:false}}if(shared===theirs.length){return{merged:historyEntriesToRaw(ours),strategy:"fast_forward_ours",common_entries:shared,entries_from_ours:ours.length-shared,entries_from_theirs:0,entries_total:ours.length,reanchored:false}}if(shared===ours.length){return{merged:historyEntriesToRaw(theirs),strategy:"fast_forward_theirs",common_entries:shared,entries_from_ours:0,entries_from_theirs:theirs.length-shared,entries_total:theirs.length,reanchored:false}}const oursSuffix=ours.slice(shared);const seenIdentities=new Set(oursSuffix.map(historyEntryIdentity));const theirsSuffix=theirs.slice(shared).filter(entry=>!seenIdentities.has(historyEntryIdentity(entry)));const mergedSuffix=[...oursSuffix,...theirsSuffix].sort((left,right)=>{const byTs=compareTimestampStrings(left.ts,right.ts);if(byTs!==0){return byTs}const leftFromOurs=seenIdentities.has(historyEntryIdentity(left));const rightFromOurs=seenIdentities.has(historyEntryIdentity(right));if(leftFromOurs!==rightFromOurs){return Number(rightFromOurs)-Number(leftFromOurs)}return historyEntryIdentity(left).localeCompare(historyEntryIdentity(right))});const reanchored=reanchorHistoryEntries([...ours.slice(0,shared),...mergedSuffix],void 0,{continuousHashSurface:true});if(reanchored.skippedOps>0){throw new PmCliError(`History union cannot preserve ${reanchored.skippedOps} patch operation(s) after deterministic suffix ordering; leave the file unresolved for manual recovery.`,EXIT_CODE.GENERIC_FAILURE)}return{merged:historyEntriesToRaw(reanchored.entries),strategy:"union_reanchor",common_entries:shared,entries_from_ours:oursSuffix.length,entries_from_theirs:theirsSuffix.length,entries_total:reanchored.entries.length,reanchored:true}}function parseRelationshipJsonl(raw,label){const conflictMarker=findFirstMergeConflictMarker(raw);if(conflictMarker){throw new PmCliError(`Relationship merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}. Merge drivers must receive clean per-side versions.`,EXIT_CODE.GENERIC_FAILURE)}const events=[];for(const[index,rawLine]of raw.split(/\r?\n/).entries()){const line=rawLine.trim();if(!line){continue}let parsed;try{parsed=JSON.parse(line)}catch{throw new PmCliError(`Relationship merge input (${label}) contains invalid JSON at line ${index+1}.`,EXIT_CODE.GENERIC_FAILURE)}if(typeof parsed!=="object"||parsed===null||Array.isArray(parsed)||typeof parsed.eventId!=="string"||typeof parsed.sequence!=="number"){throw new PmCliError(`Relationship merge input (${label}) line ${index+1} is not a relationship event (eventId + sequence required).`,EXIT_CODE.GENERIC_FAILURE)}events.push(parsed)}return events}function relationshipEventsToRaw(events){return events.length===0?"":`${events.map(event=>JSON.stringify(event)).join("\n")}
+`}function renumberRelationshipEvents(events){return events.map((event,index)=>({...event,sequence:index+1}))}function mergeRelationshipEventStreams(baseRaw,oursRaw,theirsRaw){parseRelationshipJsonl(baseRaw,"base");const ours=parseRelationshipJsonl(oursRaw,"ours");const theirs=parseRelationshipJsonl(theirsRaw,"theirs");const limit=Math.min(ours.length,theirs.length);let shared=0;while(shared<limit&&ours[shared].eventId===theirs[shared].eventId){shared+=1}if(shared===ours.length&&shared===theirs.length){return{merged:relationshipEventsToRaw(ours),strategy:"identical",common_entries:shared,entries_from_ours:0,entries_from_theirs:0,entries_total:ours.length,reanchored:false}}if(shared===theirs.length){return{merged:relationshipEventsToRaw(ours),strategy:"fast_forward_ours",common_entries:shared,entries_from_ours:ours.length-shared,entries_from_theirs:0,entries_total:ours.length,reanchored:false}}if(shared===ours.length){return{merged:relationshipEventsToRaw(theirs),strategy:"fast_forward_theirs",common_entries:shared,entries_from_ours:0,entries_from_theirs:theirs.length-shared,entries_total:theirs.length,reanchored:false}}const oursSuffix=ours.slice(shared);const oursEventIds=new Set(oursSuffix.map(event=>event.eventId));const theirsSuffix=theirs.slice(shared).filter(event=>!oursEventIds.has(event.eventId));const mergedSuffix=[...oursSuffix,...theirsSuffix].sort((left,right)=>{if(left.timestamp!==void 0&&right.timestamp!==void 0){const byTs=compareTimestampStrings(left.timestamp,right.timestamp);if(byTs!==0){return byTs}}else if(left.timestamp===void 0&&right.timestamp!==void 0){return 1}else if(left.timestamp!==void 0){return-1}const leftFromOurs=oursEventIds.has(left.eventId);const rightFromOurs=oursEventIds.has(right.eventId);if(leftFromOurs!==rightFromOurs){return Number(rightFromOurs)-Number(leftFromOurs)}return 0});const merged=renumberRelationshipEvents([...ours.slice(0,shared),...mergedSuffix]);return{merged:relationshipEventsToRaw(merged),strategy:"union_reanchor",common_entries:shared,entries_from_ours:oursSuffix.length,entries_from_theirs:theirsSuffix.length,entries_total:merged.length,reanchored:true}}const ITEM_UNION_COLLECTION_FIELDS=["tags","dependencies","comments","notes","learnings","files","tests","test_runs","docs","reminders","events"];const ITEM_UNION_DELIMITED_FIELDS=["acceptance_criteria"];const ITEM_LATEST_TIMESTAMP_FIELDS=["updated_at"];function jsonEquals(left,right){if(left===void 0||right===void 0){return left===void 0&&right===void 0}return stableStringify(left)===stableStringify(right)}function unionCollection(base,ours,theirs){const toEntries=value=>Array.isArray(value)?value:[];const baseIds=new Set(toEntries(base).map(entry=>stableStringify(entry)));const oursEntries=toEntries(ours);const oursIds=new Set(oursEntries.map(entry=>stableStringify(entry)));const theirsEntries=toEntries(theirs);const theirsIds=new Set(theirsEntries.map(entry=>stableStringify(entry)));const merged=oursEntries.filter(entry=>{const identity=stableStringify(entry);return!baseIds.has(identity)||theirsIds.has(identity)});for(const entry of theirsEntries){const identity=stableStringify(entry);if(!oursIds.has(identity)&&!baseIds.has(identity)){merged.push(entry)}}return merged}function linkedTestDefinitionIdentity(value){if(typeof value!=="object"||value===null||Array.isArray(value)){return stableStringify(value)}const{provenance:_provenance,...definition}=value;return stableStringify(definition)}function markMergedLinkedTest(value){if(typeof value!=="object"||value===null||Array.isArray(value)){return value}const test=value;if(!test.provenance){return{...test,provenance:{source_kind:"merge_union"}}}return{...test,provenance:{...test.provenance,source_kind:"merge_union"}}}function unionLinkedTests(base,ours,theirs){const toEntries=value=>Array.isArray(value)?value:[];const baseIds=new Set(toEntries(base).map(linkedTestDefinitionIdentity));const oursEntries=toEntries(ours);const oursIds=new Set(oursEntries.map(linkedTestDefinitionIdentity));const theirsEntries=toEntries(theirs);const theirsIds=new Set(theirsEntries.map(linkedTestDefinitionIdentity));const merged=oursEntries.filter(entry=>{const identity=linkedTestDefinitionIdentity(entry);return!baseIds.has(identity)||theirsIds.has(identity)});for(const entry of theirsEntries){const identity=linkedTestDefinitionIdentity(entry);if(!oursIds.has(identity)&&!baseIds.has(identity)){merged.push(markMergedLinkedTest(entry))}}return merged}function latestTimestamp(ours,theirs){return compareTimestampStrings(String(ours),String(theirs))>=0?ours:theirs}function mergeScalarThreeWay(base,ours,theirs,preferred){if(jsonEquals(ours,theirs)){return{value:ours,from_theirs:false,conflict:false}}if(jsonEquals(base,ours)){return{value:theirs,from_theirs:true,conflict:false}}if(jsonEquals(base,theirs)){return{value:ours,from_theirs:false,conflict:false}}return{value:preferred==="theirs"?theirs:ours,from_theirs:preferred==="theirs",conflict:true}}function mergeItemScalarThreeWay(base,ours,theirs,preferred,conflictResolution,oursUpdatedAt,theirsUpdatedAt){const outcome=mergeScalarThreeWay(base,ours,theirs,preferred);if(!outcome.conflict){return{...outcome,conflict:false}}if(conflictResolution==="preferred_side"){return{...outcome,resolution_basis:"requested_preference",retained_side:outcome.from_theirs?"theirs":"ours"}}const timestampOrder=compareTimestampStrings(oursUpdatedAt,theirsUpdatedAt);if(conflictResolution==="latest_document_update"&&timestampOrder!==0){const retainTheirs2=timestampOrder<0;return{value:retainTheirs2?theirs:ours,from_theirs:retainTheirs2,conflict:true,resolution_basis:"document_updated_at",retained_side:retainTheirs2?"theirs":"ours"}}const retainTheirs=stableStringify(encodeItemScalarDecisionValue(theirs)).localeCompare(stableStringify(encodeItemScalarDecisionValue(ours)))<0;return{value:retainTheirs?theirs:ours,from_theirs:retainTheirs,conflict:true,resolution_basis:"stable_value_tiebreak",retained_side:retainTheirs?"theirs":"ours"}}function toMetadataRecord(document){return{...document.metadata}}function parseItemMergeSide(raw,label,options){try{const document=canonicalDocument(parseItemDocument(raw,options),options);const reservedField=Object.entries(document.metadata).find(([,value])=>isItemScalarMissingValue(value))?.[0];if(reservedField!==void 0){throw new TypeError(`metadata field ${reservedField} uses the reserved missing-scalar evidence marker`)}return document}catch(error){throw new PmCliError(`Item merge input (${label}) is not a readable item document: ${String(error)}`,EXIT_CODE.GENERIC_FAILURE)}}function mergeItemUnionField(params){if(!params.unionFieldSet.has(params.field))return false;const union=params.field==="tests"?unionLinkedTests(params.baseValue,params.oursValue,params.theirsValue):params.field==="acceptance_criteria"?unionCollection(splitAcceptanceCriteria(params.baseValue),splitAcceptanceCriteria(params.oursValue),splitAcceptanceCriteria(params.theirsValue)).join("; "):unionCollection(params.baseValue,params.oursValue,params.theirsValue);params.accumulator.merged[params.field]=union;if(!jsonEquals(union,params.oursValue)){params.accumulator.unionFields.push(params.field)}return true}function mergeItemScalarField(params){const outcome=mergeItemScalarThreeWay(params.baseValue,params.oursValue,params.theirsValue,params.preferred,params.conflictResolution,params.oursUpdatedAt,params.theirsUpdatedAt);if(outcome.value!==void 0){params.accumulator.merged[params.field]=outcome.value}if(outcome.conflict){params.accumulator.conflictFields.push(params.field);params.accumulator.conflictDecisions.push({field:params.field,base:encodeItemScalarDecisionValue(params.baseValue),ours:encodeItemScalarDecisionValue(params.oursValue),theirs:encodeItemScalarDecisionValue(params.theirsValue),retained:encodeItemScalarDecisionValue(outcome.value),discarded:encodeItemScalarDecisionValue(outcome.from_theirs?params.oursValue:params.theirsValue),retained_side:outcome.retained_side,resolution_basis:outcome.resolution_basis})}else if(outcome.from_theirs){params.accumulator.fieldsFromTheirs.push(params.field)}}function mergeItemMetadataRecords(baseRecord,oursRecord,theirsRecord,preferred,conflictResolution,oursUpdatedAt,theirsUpdatedAt){const unionFieldSet=new Set([...ITEM_UNION_COLLECTION_FIELDS,...ITEM_UNION_DELIMITED_FIELDS]);const latestFieldSet=new Set(ITEM_LATEST_TIMESTAMP_FIELDS);const fieldNames=[...new Set([...Object.keys(oursRecord),...Object.keys(theirsRecord)])].sort((left,right)=>left.localeCompare(right));const accumulator={merged:{},conflictFields:[],fieldsFromTheirs:[],unionFields:[],conflictDecisions:[]};for(const field of fieldNames){const baseValue=baseRecord[field];const oursValue=oursRecord[field];const theirsValue=theirsRecord[field];if(mergeItemUnionField({field,baseValue,oursValue,theirsValue,unionFieldSet,accumulator})){continue}if(latestFieldSet.has(field)){accumulator.merged[field]=latestTimestamp(oursValue,theirsValue);continue}mergeItemScalarField({field,baseValue,oursValue,theirsValue,preferred,conflictResolution,oursUpdatedAt,theirsUpdatedAt,accumulator})}return accumulator}function mergeItemDocuments(baseRaw,oursRaw,theirsRaw,options={}){const preferred=options.preferred??"ours";const conflictResolution=options.conflictResolution??"preferred_side";const hasBase=baseRaw.trim().length>0;const ours=parseItemMergeSide(oursRaw,"ours",options);const theirs=parseItemMergeSide(theirsRaw,"theirs",options);const base=hasBase?parseItemMergeSide(baseRaw,"base",options):ours;const baseRecord=hasBase?toMetadataRecord(base):{};const oursRecord=toMetadataRecord(ours);const theirsRecord=toMetadataRecord(theirs);const{merged,conflictFields,fieldsFromTheirs,unionFields,conflictDecisions}=mergeItemMetadataRecords(baseRecord,oursRecord,theirsRecord,preferred,conflictResolution,ours.metadata.updated_at,theirs.metadata.updated_at);const bodyOutcome=mergeItemScalarThreeWay(hasBase?base.body:"",ours.body,theirs.body,preferred,conflictResolution,ours.metadata.updated_at,theirs.metadata.updated_at);if(bodyOutcome.conflict){conflictFields.push("body");conflictDecisions.push({field:"body",base:encodeItemScalarDecisionValue(hasBase?base.body:""),ours:encodeItemScalarDecisionValue(ours.body),theirs:encodeItemScalarDecisionValue(theirs.body),retained:encodeItemScalarDecisionValue(bodyOutcome.value),discarded:encodeItemScalarDecisionValue(bodyOutcome.from_theirs?ours.body:theirs.body),retained_side:bodyOutcome.retained_side,resolution_basis:bodyOutcome.resolution_basis})}else if(bodyOutcome.from_theirs){fieldsFromTheirs.push("body")}const mergedRaw=serializeItemDocument({metadata:merged,body:bodyOutcome.value},options);return{merged:mergedRaw,conflict_fields:conflictFields,fields_from_theirs:fieldsFromTheirs,union_fields:unionFields,conflict_decisions:conflictDecisions,requested_preference:preferred,requested_preference_applied:conflictResolution==="preferred_side",conflict_resolution:conflictResolution}}function isPlainObject(value){return typeof value==="object"&&value!==null&&!Array.isArray(value)}function parseJsonSide(raw,label){const conflictMarker=findFirstMergeConflictMarker(raw);if(conflictMarker){throw new PmCliError(`JSON merge input (${label}) contains unresolved conflict markers at line ${conflictMarker.line}.`,EXIT_CODE.GENERIC_FAILURE)}if(raw.trim().length===0){return void 0}try{return JSON.parse(raw)}catch{throw new PmCliError(`JSON merge input (${label}) is not valid JSON.`,EXIT_CODE.GENERIC_FAILURE)}}function mergeAdditiveJsonArrays(base,ours,theirs){if(!Array.isArray(base)||!Array.isArray(ours)||!Array.isArray(theirs)){return null}const countEntries=entries=>{const counts=new Map;for(const entry of entries){const identity=stableStringify(entry);counts.set(identity,(counts.get(identity)??0)+1)}return counts};const baseCounts=countEntries(base);const oursCounts=countEntries(ours);const theirsCounts=countEntries(theirs);for(const[identity,baseCount]of baseCounts){if((oursCounts.get(identity)??0)<baseCount||(theirsCounts.get(identity)??0)<baseCount){return null}}const unmatchedOursCounts=new Map(oursCounts);const additionsFromTheirs=[];for(const entry of theirs){const identity=stableStringify(entry);const unmatchedOursCount=unmatchedOursCounts.get(identity)??0;if(unmatchedOursCount>0){unmatchedOursCounts.set(identity,unmatchedOursCount-1)}else{additionsFromTheirs.push(entry)}}return{merged:[...ours,...additionsFromTheirs],acceptedTheirs:additionsFromTheirs.length>0}}function mergeJsonObjects(base,ours,theirs,preferred,pathPrefix,conflictPaths,pathsFromTheirs){if(!isPlainObject(ours)||!isPlainObject(theirs)){return null}const baseObject=isPlainObject(base)?base:{};const merged={};const keys=[...new Set([...Object.keys(ours),...Object.keys(theirs)])].sort((left,right)=>left.localeCompare(right));for(const key of keys){const childPath=pathPrefix.length>0?`${pathPrefix}.${key}`:key;const child=mergeJsonKey(baseObject,ours,theirs,key,preferred,childPath,conflictPaths,pathsFromTheirs);if(child!==void 0){merged[key]=child}}return merged}function mergeJsonValue(base,ours,theirs,preferred,pathPrefix,conflictPaths,pathsFromTheirs){if(jsonEquals(ours,theirs)){return ours}const additiveArrayMerge=mergeAdditiveJsonArrays(base,ours,theirs);if(additiveArrayMerge!==null){if(additiveArrayMerge.acceptedTheirs){pathsFromTheirs.push(pathPrefix)}return additiveArrayMerge.merged}const mergedObject=mergeJsonObjects(base,ours,theirs,preferred,pathPrefix,conflictPaths,pathsFromTheirs);if(mergedObject!==null){return mergedObject}const outcome=mergeScalarThreeWay(base,ours,theirs,preferred);if(outcome.conflict){conflictPaths.push(pathPrefix)}else if(outcome.from_theirs){pathsFromTheirs.push(pathPrefix)}return outcome.value}function mergeJsonKey(base,ours,theirs,key,preferred,childPath,conflictPaths,pathsFromTheirs){const inOurs=Object.prototype.hasOwnProperty.call(ours,key);const inTheirs=Object.prototype.hasOwnProperty.call(theirs,key);const inBase=Object.prototype.hasOwnProperty.call(base,key);if(inOurs&&inTheirs){return mergeJsonValue(base[key],ours[key],theirs[key],preferred,childPath,conflictPaths,pathsFromTheirs)}if(inOurs){if(inBase&&jsonEquals(base[key],ours[key])){pathsFromTheirs.push(childPath);return void 0}if(inBase){conflictPaths.push(childPath);return preferred==="theirs"?void 0:ours[key]}return ours[key]}if(inBase&&jsonEquals(base[key],theirs[key])){return void 0}if(inBase){conflictPaths.push(childPath);return preferred==="theirs"?theirs[key]:void 0}pathsFromTheirs.push(childPath);return theirs[key]}function mergeJsonDocuments(baseRaw,oursRaw,theirsRaw,options={}){const preferred=options.preferred??"ours";const base=parseJsonSide(baseRaw,"base");const ours=parseJsonSide(oursRaw,"ours");const theirs=parseJsonSide(theirsRaw,"theirs");const conflictPaths=[];const pathsFromTheirs=[];const merged=mergeJsonValue(base,ours,theirs,preferred,"",conflictPaths,pathsFromTheirs);return{merged:`${JSON.stringify(merged??null,null,2)}
+`,conflict_paths:conflictPaths,paths_from_theirs:pathsFromTheirs,preferred}}export{ITEM_LATEST_TIMESTAMP_FIELDS,ITEM_SCALAR_MISSING_VALUE,ITEM_UNION_COLLECTION_FIELDS,encodeItemScalarDecisionValue,hashItemScalarDecisionValue,isItemScalarMissingValue,mergeHistoryStreams,mergeItemDocuments,mergeJsonDocuments,mergeRelationshipEventStreams};
 //# sourceMappingURL=three-way.js.map
-//# debugId=4d5434c7-544b-5061-89eb-6e4074e58e30