@ibgib/vcs-gib 0.0.30 → 0.0.32

package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs

@@ -1,570 +0,0 @@
-/**
- * @module b2tfs-3way-graft-strategy
- *
- * ============================================================================
- * ⚠️ CRITICAL GRAFT STRATEGY GUIDANCE WARNING ⚠️
- * BEFORE MAKING ANY CHANGES TO THIS FILE, YOU MUST CONSULT AND CAREFULLY READ:
- *   libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md
- *
- * Graft strategies must strictly fulfill the `GraftTimelinesResult` contract,
- * ensure timeline `n` monotonicity (using Math.max over base/orphan branch frames),
- * and include ALL newly referenced ancillary dependency nodes (comments, binary
- * stones, DNAs) in `ancillaryIbGibsCreated` so that the destination branch
- * space is completely self-contained.
- * ============================================================================
- *
- * 3-way text line diff graft strategy for B2tFS file item timelines.
- * Reconciles diverging file content via 3-way line diff (LCA, Base, Orphan)
- * and inserts Git conflict markers when line edits collide.
- *
- * Non-text binaries and non-file items return early / false in `canGraft` and
- * fall through to `DefaultDnaReplayGraftStrategy`.
- * Folder hierarchies are re-synchronized post-merge via `reifyB2tFSHierarchy`.
- */
-import { extractErrorMsg, hash } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { getGib, isDna } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
-import { rel8 } from '@ibgib/ts-gib/dist/V1/transforms/rel8.mjs';
-import { GraftMergeStrategyBase_V1 } from '@ibgib/core-gib/dist/sync/graft-info/graft-merge-strategy-base-v1.mjs';
-import { getFromSpace, persistTransformResult, registerNewIbGib, putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { getBinIb, getIbGibsFromCache_fallbackToSpaces, splitPerTjpAndOrDna, getTimelinesGroupedByTjp } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-import { getDependencyGraph } from '@ibgib/core-gib/dist/common/other/graph-helper.mjs';
-import { createGraftInfo } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-helpers.mjs';
-import { GRAFT_INFO_REL8N_NAME } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-constants.mjs';
-import { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { isBinaryBuffer, decodeToLines, computeLineLcsDiff } from '../diff/line-diff-helper.mjs';
-import { BINARY_REL8N_NAME, B2tFSType } from '../item/item-types.mjs';
-import { evolveB2tFSItemIbGib, isB2tFSItemIbGib } from '../item/item-helper.mjs';
-const lcFile = `[b2tfs-3way-graft-strategy]`;
-const logalot = GLOBAL_LOG_A_LOT;
-const mergeDiag = `[MERGE DIAGNOSTIC]`;
-/**
- * Performs 3-way line diff merging across LCA, Base, and Orphan text lines.
- * Inserts Git conflict markers (`<<<<<<< HEAD`, `=======`, `>>>>>>>`) when overlapping
- * line changes conflict.
- */
-export function perform3WayTextLineMerge({ textLCA, textBase, textOrphan, }) {
-    if (textBase === textOrphan) {
-        return { mergedText: textBase, hasConflict: false };
-    }
-    if (textBase === textLCA) {
-        return { mergedText: textOrphan, hasConflict: false };
-    }
-    if (textOrphan === textLCA) {
-        return { mergedText: textBase, hasConflict: false };
-    }
-    const linesLCA = textLCA.split(/\r?\n/);
-    const linesBase = textBase.split(/\r?\n/);
-    const linesOrphan = textOrphan.split(/\r?\n/);
-    const chunksBase = computeLineLcsDiff(linesLCA, linesBase);
-    const chunksOrphan = computeLineLcsDiff(linesLCA, linesOrphan);
-    if (chunksBase.length === 0) {
-        return { mergedText: textOrphan, hasConflict: false };
-    }
-    if (chunksOrphan.length === 0) {
-        return { mergedText: textBase, hasConflict: false };
-    }
-    let hasConflict = false;
-    const outputLines = [];
-    let lcaIdx = 0;
-    let baseChunkIdx = 0;
-    let orphanChunkIdx = 0;
-    while (lcaIdx < linesLCA.length || baseChunkIdx < chunksBase.length || orphanChunkIdx < chunksOrphan.length) {
-        const nextBaseChunk = chunksBase[baseChunkIdx];
-        const nextOrphanChunk = chunksOrphan[orphanChunkIdx];
-        const baseAtLca = nextBaseChunk && nextBaseChunk.old_i === lcaIdx;
-        const orphanAtLca = nextOrphanChunk && nextOrphanChunk.old_i === lcaIdx;
-        if (baseAtLca && orphanAtLca) {
-            const bLines = nextBaseChunk.newLines;
-            const oLines = nextOrphanChunk.newLines;
-            const bOldLen = nextBaseChunk.oldLines.length;
-            const oOldLen = nextOrphanChunk.oldLines.length;
-            if (bLines.join('\n') === oLines.join('\n') && bOldLen === oOldLen) {
-                outputLines.push(...bLines);
-            }
-            else {
-                hasConflict = true;
-                outputLines.push('<<<<<<< HEAD');
-                outputLines.push(...bLines);
-                outputLines.push('=======');
-                outputLines.push(...oLines);
-                outputLines.push('>>>>>>>');
-            }
-            const consumedLca = Math.max(bOldLen, oOldLen, 1);
-            lcaIdx += consumedLca;
-            baseChunkIdx++;
-            orphanChunkIdx++;
-        }
-        else if (baseAtLca) {
-            outputLines.push(...nextBaseChunk.newLines);
-            const consumedLca = Math.max(nextBaseChunk.oldLines.length, 1);
-            lcaIdx += consumedLca;
-            baseChunkIdx++;
-        }
-        else if (orphanAtLca) {
-            outputLines.push(...nextOrphanChunk.newLines);
-            const consumedLca = Math.max(nextOrphanChunk.oldLines.length, 1);
-            lcaIdx += consumedLca;
-            orphanChunkIdx++;
-        }
-        else {
-            if (lcaIdx < linesLCA.length) {
-                outputLines.push(linesLCA[lcaIdx]);
-                lcaIdx++;
-            }
-            else {
-                if (nextBaseChunk && baseChunkIdx < chunksBase.length) {
-                    outputLines.push(...nextBaseChunk.newLines);
-                    baseChunkIdx++;
-                }
-                if (nextOrphanChunk && orphanChunkIdx < chunksOrphan.length) {
-                    outputLines.push(...nextOrphanChunk.newLines);
-                    orphanChunkIdx++;
-                }
-            }
-        }
-    }
-    return {
-        mergedText: outputLines.join('\n'),
-        hasConflict,
-    };
-}
-/**
- * 3-way text line diff graft strategy for B2tFS file item timelines.
- *
- * ⚠️ **IMPORTANT**: Before making ANY changes to this class or its methods, consult:
- * `libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md`.
- */
-export class B2tFS3WayGraftStrategy extends GraftMergeStrategyBase_V1 {
-    strategyId = 'B2tFS3WayGraftStrategy';
-    lc = '[B2tFS3WayGraftStrategy]';
-    /**
-     * Returns true only if the graft context has two tips that are text-based file b2tfs item ibgibs.
-     *
-     * @param context info about the divergent timelines {@link GraftContext}
-     * @returns true if it's a text file item ibgib, else false
-     */
-    async canGraft(context) {
-        const lc = `${this.lc}[${this.canGraft.name}]`;
-        try {
-            const { conflictStrategy, timelineAddrsA, timelineAddrsB, ibGibReadCache, space } = context;
-            const hasRelevantStrategy = conflictStrategy === SyncConflictStrategy.optimisticWithLCS || conflictStrategy === 'b2tfs3WayMerge';
-            if (!hasRelevantStrategy) {
-                return false;
-            }
-            const tipAddrA = timelineAddrsA.at(-1);
-            const tipAddrB = timelineAddrsB.at(-1);
-            if (!tipAddrA || !tipAddrB) {
-                if (logalot) {
-                    console.log(`${lc} we don't have two tip addrs? (I: b20b6de462c35e0e74360cc8d317f126)`);
-                }
-                return false;
-            }
-            const [tipA, tipB] = await getIbGibsFromCache_fallbackToSpaces({
-                addrs: [tipAddrA, tipAddrB],
-                readCache_graph: ibGibReadCache,
-                space,
-            });
-            if (!tipA) {
-                throw new Error(`(UNEXPECTED) tipA falsy? (E: 752101026888140f074614e893531826)`);
-            }
-            if (!tipB) {
-                throw new Error(`(UNEXPECTED) tipB falsy? (E: d4d4a876cad8c7869830d33832bfde26)`);
-            }
-            const bothTipsAreB2tFSNodes = isB2tFSItemIbGib(tipA) && isB2tFSItemIbGib(tipB);
-            if (!bothTipsAreB2tFSNodes) {
-                if (isB2tFSItemIbGib(tipA) || isB2tFSItemIbGib(tipB)) {
-                    console.error(`${lc}${mergeDiag} (UNEXPECTED)(NOT THROWN) only tipA or tipB but not both are b2tfs items? (E: cacb38796da881268898e9d1af245826)`);
-                }
-                return false;
-            }
-            if (tipA.data.fsType !== tipB.data.fsType) {
-                throw new Error(`(UNEXPECTED) tipA.data.fsType (${tipA.data.fsType}) !== tipB.data.fsType (${tipB.data.fsType})? (E: c01c1885ac738f679813117852c48426)`);
-            }
-            // only do files. folders and other containers fall back to DefaultDnaReplayGraftStrategy.
-            const isFile = tipA.data.fsType === B2tFSType.file;
-            if (!isFile) {
-                return false;
-            }
-            return true;
-        }
-        catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)} (E: 8b7c6d5e4f3a2b1c0d9e8f7a6b5c4d3e)`);
-            return false;
-        }
-    }
-    /**
-     * Executes 3-way line diff text graft across LCA, Base, and Orphan file items.
-     *
-     * ⚠️ **CRITICAL CONTRACT**: Before modifying this method, review:
-     * `libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md`
-     * Ensure:
-     * 1. Monotonic `n` counter (`highestDataN = Math.max(...)`)
-     * 2. Full dependency graph inclusion in `ancillaryIbGibsCreated` (comments, bin stones, DNAs)
-     * 3. Self-contained destination branch space
-     */
-    async graft(context) {
-        const lc = `${lcFile}[${this.strategyId}][${this.graft.name}]`;
-        try {
-            if (logalot) {
-                console.log(`${lc} starting 3-way B2tFS snapshot graft... (I: 91a82b3c4d5e6f7a8b9c0d1e2f3a4b5c)`);
-            }
-            const { conflictStrategy, timelineAddrsA, timelineAddrsB, latestCommonFrameAddr, ibGibReadCache, space, graftPreference, } = context;
-            // 1. Fetch branch slices since LCA (timeline A = Sender, timeline B = Receiver)
-            const indexLCA_A = timelineAddrsA.lastIndexOf(latestCommonFrameAddr);
-            const addrsA_sinceLCA = timelineAddrsA.slice(indexLCA_A + 1);
-            const branchA_sender_sinceLCA = await getIbGibsFromCache_fallbackToSpaces({
-                readCache_graph: ibGibReadCache,
-                addrs: addrsA_sinceLCA,
-                space,
-            });
-            const tipA_sender = branchA_sender_sinceLCA.at(-1);
-            const indexLCA_B = timelineAddrsB.lastIndexOf(latestCommonFrameAddr);
-            const addrsB_sinceLCA = timelineAddrsB.slice(indexLCA_B + 1);
-            const branchB_receiver_sinceLCA = await getIbGibsFromCache_fallbackToSpaces({
-                readCache_graph: ibGibReadCache,
-                addrs: addrsB_sinceLCA,
-                space,
-            });
-            const tipB_receiver = branchB_receiver_sinceLCA.at(-1);
-            // 2. Base & Orphan resolution via DRY helper
-            const { baseTip, baseBranch, orphanTip, orphanBranch, } = this.resolveBaseAndOrphan({
-                graftPreference,
-                tipA_sender,
-                branchA_sender_sinceLCA,
-                tipB_receiver,
-                branchB_receiver_sinceLCA,
-            });
-            const baseTipAddr = getIbGibAddr({ ibGib: baseTip });
-            const baseBranchAddrs = baseBranch.map(x => getIbGibAddr({ ibGib: x }));
-            const orphanTipAddr = getIbGibAddr({ ibGib: orphanTip });
-            const orphanBranchAddrs = orphanBranch.map(x => getIbGibAddr({ ibGib: x }));
-            if (logalot) {
-                console.log(`${lc} baseBranchAddrs:\n${baseBranchAddrs.join('\n')} (I: 2cad420d7bc822f798b8a8785f1f8c26)`);
-                console.log(`${lc} orphanBranchAddrs:\n${orphanBranchAddrs.join('\n')} (I: cc86489d6737e2aced42b585cba13526)`);
-            }
-            // 3. Perform 3-way filesystem tree merge across lcaItem, baseItem, orphanItem
-            const lcaNode = await this.fetchIbGib({ addr: latestCommonFrameAddr, space, readCache_graph: ibGibReadCache });
-            if (!lcaNode) {
-                throw new Error(`(UNEXPECTED) lcaNode falsy? (E: a8b2d80dc4f8ba1448fa280d89dfb626)`);
-            }
-            const lcaItem = await this.resolveRootItemNode({ nodeOrAddr: lcaNode, space, readCache_graph: ibGibReadCache });
-            if (!lcaItem) {
-                throw new Error(`(UNEXPECTED) lcaItem falsy? (E: 0944f88dde58cbabf82342b814955826)`);
-            }
-            const baseItem = await this.resolveRootItemNode({ nodeOrAddr: baseTip, space, readCache_graph: ibGibReadCache });
-            if (!baseItem) {
-                throw new Error(`(UNEXPECTED) baseItem falsy? (E: fac3087884cbebc7083e580514002826)`);
-            }
-            const orphanItem = await this.resolveRootItemNode({ nodeOrAddr: orphanTip, space, readCache_graph: ibGibReadCache });
-            if (!orphanItem) {
-                throw new Error(`(UNEXPECTED) orphanItem falsy? (E: 8e7e383753a8814f283280ee82156826)`);
-            }
-            if (lcaItem.data.fsType !== baseItem.data.fsType) {
-                throw new Error(`(UNEXPECTED) lcaItem.data.fsType !== baseItem.data.fsType? (E: 794608f3e678a399ed670388629a6826)`);
-            }
-            if (lcaItem.data.fsType !== orphanItem.data.fsType) {
-                throw new Error(`(UNEXPECTED) lcaItem.data.fsType !== orphanItem.data.fsType? (E: 2813981c8c422b41f85a02fd8aa88226)`);
-            }
-            const fsType = lcaItem.data.fsType;
-            if (fsType === B2tFSType.folder) {
-                throw new Error(`(UNEXPECTED) fsType === B2tFSType.folder? Folders fall back to DefaultDnaReplayGraftStrategy and reification. (E: b282b8f77b18575378edb902bd80a826)`);
-            }
-            if (fsType !== B2tFSType.file) {
-                throw new Error(`(UNEXPECTED) fsType (${fsType}) is not a file? (E: 272418fe2067ea3e16dac028e86d1a26)`);
-            }
-            const lcaPayload = await this.getFilePayloadBuffer({ fileItem: lcaItem, space, readCache_graph: ibGibReadCache });
-            const basePayload = await this.getFilePayloadBuffer({ fileItem: baseItem, space, readCache_graph: ibGibReadCache });
-            const orphanPayload = await this.getFilePayloadBuffer({ fileItem: orphanItem, space, readCache_graph: ibGibReadCache });
-            const isBaseBin = basePayload ? isBinaryBuffer(basePayload.buffer) : false;
-            const isOrphanBin = orphanPayload ? isBinaryBuffer(orphanPayload.buffer) : false;
-            const isLcaBin = lcaPayload ? isBinaryBuffer(lcaPayload.buffer) : false;
-            if (isBaseBin || isOrphanBin || isLcaBin) {
-                if (logalot) {
-                    console.log(`${lc} Non-text binary file detected (${baseItem.data?.name}). Skipping 3-way line diff and falling through. (I: 4e3f2a1b0c9d8e7f6a5b4c3d2e1f0a9b)`);
-                }
-                return undefined;
-            }
-            if (!lcaPayload) {
-                throw new Error(`(UNEXPECTED) lcaPayload falsy? (E: 0b82892204482f5538a430b8915b7826)`);
-            }
-            if (!basePayload) {
-                throw new Error(`(UNEXPECTED) basePayload falsy? (E: af1f68a020280b3a5d6ed4a812acd426)`);
-            }
-            if (!orphanPayload) {
-                throw new Error(`(UNEXPECTED) orphanPayload falsy? (E: 6a521b684763862c3a2e0ca315d62826)`);
-            }
-            const textLCA = decodeToLines(lcaPayload.buffer).join('\n');
-            const textBase = decodeToLines(basePayload.buffer).join('\n');
-            const textOrphan = decodeToLines(orphanPayload.buffer).join('\n');
-            if (logalot) {
-                console.log(`${lc}${mergeDiag} file: ${baseItem.data.name}`);
-                console.log(`${lc}${mergeDiag} textLCA:\n${textLCA}`);
-                console.log(`${lc}${mergeDiag} textBase:\n${textBase}`);
-                console.log(`${lc}${mergeDiag} textOrphan:\n${textOrphan}`);
-            }
-            const { mergedText } = perform3WayTextLineMerge({ textLCA, textBase, textOrphan });
-            if (logalot) {
-                console.log(`${lc}${mergeDiag} mergedText:\n${mergedText}`);
-            }
-            const dataBuffer = Buffer.from(mergedText, 'utf8');
-            const fileHash = await hash({ s: mergedText });
-            if (baseItem.data.fileExt !== orphanItem.data.fileExt) {
-                console.warn(`${lc} baseItem.data.fileExt (${baseItem.data.fileExt}) !== orphanItem.data.fileExt (${orphanItem.data.fileExt})? Using baseItem.data.fileExt for merged fileExt (W: a999b54235bb231fa49224842e212326)`);
-            }
-            const fileExt = baseItem.data.fileExt;
-            const binIb = getBinIb({
-                binHash: fileHash,
-                binExt: fileExt,
-                binEncoding: 'utf8',
-            });
-            const binIbGib = {
-                ib: binIb,
-                data: dataBuffer,
-            };
-            binIbGib.gib = await getGib({ ibGib: binIbGib, hasTjp: false });
-            const binAddr = getIbGibAddr({ ibGib: binIbGib });
-            await putInSpace({ ibGib: binIbGib, space });
-            await registerNewIbGib({ ibGib: binIbGib, space });
-            const fnGetN = (item) => {
-                if (item.data.n || item.data.n === 0) {
-                    return item.data.n;
-                }
-                else {
-                    throw new Error(`(UNEXPECTED) item.data.n not a number? (E: 896ceae089c83ca67817fff826be5826)`);
-                }
-            };
-            const baseItemDataN = fnGetN(baseItem);
-            const orphanItemDataN = fnGetN(orphanItem);
-            const highestDataN = Math.max(baseItemDataN, orphanItemDataN);
-            const lcaCommentAddrs = lcaItem.rel8ns?.comment || [];
-            const lcaCommentAddrsSet = new Set(lcaCommentAddrs);
-            const mergedCommentAddrsSinceLCA_base = (baseItem.rel8ns?.comment || []).filter(addr => !lcaCommentAddrsSet.has(addr));
-            const mergedCommentAddrsSinceLCA_orphan = (orphanItem.rel8ns?.comment || []).filter(addr => !lcaCommentAddrsSet.has(addr));
-            const newCommentAddrs = Array.from(new Set([...mergedCommentAddrsSinceLCA_base, ...mergedCommentAddrsSinceLCA_orphan]));
-            const allMergedCommentAddrs = Array.from(new Set([...lcaCommentAddrs, ...newCommentAddrs]));
-            const commentDepIbGibs = [];
-            if (newCommentAddrs.length > 0) {
-                for (const cAddr of newCommentAddrs) {
-                    const cIb = await this.fetchIbGib({ addr: cAddr, space, readCache_graph: ibGibReadCache });
-                    if (!cIb) {
-                        throw new Error(`(UNEXPECTED) Comment ibgib for address '${cAddr}' not found in cache or space (E: a1b2c3d4e5f67a8b9c0d1e2f3a4b5c6d)`);
-                    }
-                    commentDepIbGibs.push(cIb);
-                    const cDepGraph = await getDependencyGraph({
-                        ibGib: cIb,
-                        space,
-                        ibGibs: ibGibReadCache ? Object.values(ibGibReadCache) : undefined,
-                    });
-                    for (const depNode of Object.values(cDepGraph)) {
-                        const depAddr = getIbGibAddr({ ibGib: depNode });
-                        if (!commentDepIbGibs.some(x => getIbGibAddr({ ibGib: x }) === depAddr)) {
-                            commentDepIbGibs.push(depNode);
-                        }
-                    }
-                }
-                const { mapWithTjp_YesDna, mapWithoutTjps } = splitPerTjpAndOrDna({ ibGibs: commentDepIbGibs });
-                // Put DNA and non-timeline stones into space with isDna flag
-                for (const dnaOrStone of Object.values(mapWithoutTjps)) {
-                    if (space) {
-                        await putInSpace({ ibGib: dnaOrStone, space, isDna: isDna({ ibGib: dnaOrStone }) });
-                    }
-                }
-                // Register timeline frames in order
-                const timelinesByTjp = getTimelinesGroupedByTjp({ ibGibs: Object.values(mapWithTjp_YesDna) });
-                for (const tjpAddr of Object.keys(timelinesByTjp)) {
-                    const timeline = timelinesByTjp[tjpAddr];
-                    for (const frame of timeline) {
-                        if (space) {
-                            await putInSpace({ ibGib: frame, space });
-                            await registerNewIbGib({ ibGib: frame, space });
-                        }
-                    }
-                }
-            }
-            const evolveRes = await evolveB2tFSItemIbGib({
-                existingItem: baseItem,
-                dataToUpdate: {
-                    fileHash,
-                    n: highestDataN + 1,
-                },
-                rel8nsToUpdate: {
-                    [BINARY_REL8N_NAME]: [binAddr],
-                    ...(allMergedCommentAddrs.length > 0 ? { comment: allMergedCommentAddrs } : {}),
-                },
-            });
-            if (!evolveRes.dnas) {
-                throw new Error(`(UNEXPECTED) evolveRes.dnas falsy? (E: e640e892cc76c77f98f3881301035826)`);
-            }
-            if (!evolveRes.newIbGib) {
-                throw new Error(`(UNEXPECTED) evolveRes.newIbGib falsy? (E: 9e488d07772827b66a2aff4801905426)`);
-            }
-            const newItemWithNewBinPayload = evolveRes.newIbGib;
-            const newItemAddr = getIbGibAddr({ ibGib: newItemWithNewBinPayload });
-            if (logalot) {
-                console.log(`${lc} newItemAddr: ${newItemAddr} (I: d23eef651b88be1248ee29ca179eff26)`);
-            }
-            const newGraftDnaIbGibs = [];
-            const newGraftedIntermediateIbGibs_ordered = [];
-            newGraftDnaIbGibs.push(...evolveRes.dnas);
-            if (evolveRes.intermediateIbGibs) {
-                evolveRes.intermediateIbGibs.forEach(x => newGraftedIntermediateIbGibs_ordered.push(x));
-            }
-            await persistTransformResult({ resTransform: evolveRes, space });
-            await registerNewIbGib({ ibGib: evolveRes.newIbGib, space });
-            const b2tfsAddlGraftDetails = {
-                baseTextB2tFSItemAddr: baseTipAddr,
-                baseTextBinAddr: basePayload.binIbGib ? getIbGibAddr({ ibGib: basePayload.binIbGib }) : undefined,
-                orphanTextB2tFSItemAddr: orphanTipAddr,
-                orphanTextBinAddr: orphanPayload.binIbGib ? getIbGibAddr({ ibGib: orphanPayload.binIbGib }) : undefined,
-            };
-            // 4. Attach GraftInfo frame
-            const graftInfo = await createGraftInfo({
-                conflictStrategy,
-                details: `Merged orphan tip text with the baseTip as a starting point.`,
-                addlGraftDetails: [b2tfsAddlGraftDetails],
-                latestCommonFrameAddr,
-                baseAddrsSinceLCA: baseBranchAddrs,
-                orphanAddrsSinceLCA: orphanBranchAddrs,
-                dnaAddrsApplied: [],
-            });
-            await putInSpace({ ibGib: graftInfo, space });
-            await registerNewIbGib({ ibGib: graftInfo, space });
-            const graftInfoAddr = getIbGibAddr({ ibGib: graftInfo });
-            const resRel8GraftInfo = await rel8({
-                src: newItemWithNewBinPayload,
-                rel8nsToAddByAddr: {
-                    [GRAFT_INFO_REL8N_NAME]: [graftInfoAddr],
-                },
-                dna: true,
-                nCounter: true,
-            });
-            if (!resRel8GraftInfo.dnas) {
-                throw new Error(`(UNEXPECTED) resRel8GraftInfo.dnas falsy? (E: f3f4a83d3a08bd8de84250c389aed826)`);
-            }
-            const finalGraftTip = resRel8GraftInfo.newIbGib;
-            const finalGraftTipAddr = getIbGibAddr({ ibGib: finalGraftTip });
-            if (logalot) {
-                console.log(`${lc} finalGraftTipAddr: ${finalGraftTipAddr} (I: 583ac81fb0a84827b85c3076ffeeaf26)`);
-            }
-            newGraftedIntermediateIbGibs_ordered.push(newItemWithNewBinPayload);
-            for (const dna of resRel8GraftInfo.dnas) {
-                newGraftDnaIbGibs.push(dna);
-            }
-            await persistTransformResult({ resTransform: resRel8GraftInfo, space });
-            await registerNewIbGib({ ibGib: finalGraftTip, space });
-            return {
-                dnasReplayed: [],
-                dnasCreatedInGraft: newGraftDnaIbGibs,
-                intermediateIbGibsCreatedInGraft: newGraftedIntermediateIbGibs_ordered,
-                ancillaryIbGibsCreated: [binIbGib, ...commentDepIbGibs],
-                newGraftTip: finalGraftTip,
-                graftInfoCreated: graftInfo,
-            };
-        }
-        catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)} (E: 7b6c5d4e3f2a1b0c9d8e7f6a5b4c3d2e)`);
-            throw error;
-        }
-        finally {
-            if (logalot) {
-                console.log(`${lc} complete. (I: 6c5d4e3f2a1b0c9d8e7f6a5b4c3d2e1f)`);
-            }
-        }
-    }
-    async fetchIbGib({ addr, space, readCache_graph, }) {
-        if (!addr) {
-            return undefined;
-        }
-        if (readCache_graph) {
-            if (readCache_graph[addr]) {
-                return readCache_graph[addr];
-            }
-            const gib = addr.includes('^') ? addr.substring(addr.lastIndexOf('^') + 1) : addr;
-            const matchingKey = Object.keys(readCache_graph).find(k => k === addr || (gib && k.endsWith('^' + gib)));
-            if (matchingKey) {
-                return readCache_graph[matchingKey];
-            }
-        }
-        try {
-            const res = await getFromSpace({ space, addrs: [addr] });
-            if (res) {
-                const found = res.ibGibs?.find((x) => !!x) || res.rawResultIbGib?.ibGibs?.find((x) => !!x);
-                if (found) {
-                    return found;
-                }
-            }
-        }
-        catch {
-            // Suppress fetch error if address not found
-        }
-        return undefined;
-    }
-    async resolveRootItemNode({ nodeOrAddr, space, readCache_graph, }) {
-        if (!nodeOrAddr) {
-            throw new Error(`(UNEXPECTED) nodeOrAddr falsy? (E: 524108327b9caa00586207ea399f7226)`);
-        }
-        let node;
-        if (typeof nodeOrAddr === 'string') {
-            node = await this.fetchIbGib({ addr: nodeOrAddr, space, readCache_graph });
-        }
-        else {
-            node = nodeOrAddr;
-        }
-        if (!node) {
-            throw new Error(`(UNEXPECTED) node falsy? couldn't get node? (E: bd7d1c3b4a3881ff882746281869d826)`);
-        }
-        if (isB2tFSItemIbGib(node)) {
-            return node;
-        }
-        else {
-            throw new Error(`(UNEXPECTED) node is not a B2tFSItemIbGib_V1? (E: ddabb281ccb2fb1a181109a82046b826)`);
-        }
-    }
-    async getFilePayloadBuffer({ fileItem, space, readCache_graph, }) {
-        if (!fileItem || !fileItem.rel8ns) {
-            return undefined;
-        }
-        const binAddrs = fileItem.rel8ns[BINARY_REL8N_NAME] || [];
-        const latestBinAddr = binAddrs.at(-1);
-        if (!latestBinAddr) {
-            return undefined;
-        }
-        const binIbGib = await this.fetchIbGib({ addr: latestBinAddr, space, readCache_graph });
-        if (!binIbGib) {
-            throw new Error(`(UNEXPECTED) couldn't fetch binIbGib? latestBinAddr: ${latestBinAddr}. space.ib: ${space.ib} (E: 3d1238b3a348924038a79f88264d8226)`);
-        }
-        if (binIbGib.data === undefined) {
-            return undefined;
-        }
-        let fileData;
-        const dataObj = binIbGib.data;
-        if (dataObj && typeof dataObj === 'object' && dataObj._dataType === 'Uint8Array_Base64' && typeof dataObj.value === 'string') {
-            fileData = Buffer.from(dataObj.value, 'base64');
-        }
-        else if (typeof dataObj === 'string') {
-            fileData = Buffer.from(dataObj, 'utf8');
-        }
-        else if (dataObj instanceof Uint8Array || Buffer.isBuffer(dataObj)) {
-            fileData = dataObj;
-        }
-        else if (typeof dataObj === 'object' && dataObj !== null) {
-            if (typeof dataObj.text === 'string') {
-                fileData = Buffer.from(dataObj.text, 'utf8');
-            }
-            else if (typeof dataObj.data === 'string') {
-                fileData = Buffer.from(dataObj.data, 'utf8');
-            }
-            else {
-                const vals = Object.values(dataObj);
-                fileData = new Uint8Array(vals);
-            }
-        }
-        else {
-            fileData = new Uint8Array(0);
-        }
-        return { buffer: fileData, binIbGib };
-    }
-}
-//# sourceMappingURL=b2tfs-3way-graft-strategy.mjs.map

package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"b2tfs-3way-graft-strategy.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-strategy.mts"],"names":[],"mappings":"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"}

package/dist/engine/merge/b2tfs-3way-graft-types.d.mts

@@ -1,34 +0,0 @@
-import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
-import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
-/**
- * Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs.
- */
-export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the b2tfs item that points to the binary ibgib with text of the
-     * file in `main`
-     */
-    baseTextB2tFSItemAddr: IbGibAddr;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the binary ibgib whose text is in `main`
-     */
-    baseTextBinAddr: IbGibAddr | undefined;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the b2tfs item that points to the binary ibgib with text of the
-     * file in `my-feature-branch`
-     */
-    orphanTextB2tFSItemAddr: IbGibAddr;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the binary ibgib whose text is in `my-feature-branch`
-     */
-    orphanTextBinAddr: IbGibAddr | undefined;
-}
-//# sourceMappingURL=b2tfs-3way-graft-types.d.mts.map

package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"b2tfs-3way-graft-types.d.mts","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D;;;;;OAKG;IACH,qBAAqB,EAAE,SAAS,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,uBAAuB,EAAE,SAAS,CAAC;IACnC;;;;OAIG;IACH,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C"}

package/dist/engine/merge/b2tfs-3way-graft-types.mjs

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=b2tfs-3way-graft-types.mjs.map

package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"b2tfs-3way-graft-types.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":""}