@ibgib/vcs-gib 0.0.17 → 0.0.20

package/src/engine/merge/b2tfs-3way-merge-strategy.respec.log

@@ -0,0 +1,39 @@
+[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C260FF6E69CF76EE606B524D61293F8C09845E73FB0F433805419613DA373310.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) from space (witness space NodeFilesystemSpace_V1 b2s_main 398c1e4bf61d7d486dc4475573788a71b9de99b00bfb086d6ac9381a8c83715b undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
+[SyncSagaCoordinator][handleInitFrame] isPastFrame just threw, but is an expected error if we don't have remote. verbose logging error though: couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C260FF6E69CF76EE606B524D61293F8C09845E73FB0F433805419613DA373310.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) from space (witness space NodeFilesystemSpace_V1 b2s_main 398c1e4bf61d7d486dc4475573788a71b9de99b00bfb086d6ac9381a8c83715b undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826) (I: 47ea08d0b418cf4aa8a502a7bcb80826)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] starting 3-way B2tFS snapshot graft... (I: 91a82b3c4d5e6f7a8b9c0d1e2f3a4b5c)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] baseBranchAddrs:
+b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^24DE146D76A91D4D39902D8085165A2C7B0581C828FEE66737DAB27EE117C8A0.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A
+b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^58C2E975A2B1894565D981510C606600750304F2EBF6493E678B4E911620EBB1.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A
+(I: 2cad420d7bc822f798b8a8785f1f8c26)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] orphanBranchAddrs:
+b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^326D3AEC0E13F14AADA159B9FD2E9210FC8AEA1E2EF3715CB47D093C52FE1C7D.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A
+b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C260FF6E69CF76EE606B524D61293F8C09845E73FB0F433805419613DA373310.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A
+(I: cc86489d6737e2aced42b585cba13526)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft][MERGE DIAGNOSTIC] file: app.ts
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft][MERGE DIAGNOSTIC] textLCA:
+line 1
+line 2
+line 3
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft][MERGE DIAGNOSTIC] textBase:
+line 1 modified by main
+line 2
+line 3
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft][MERGE DIAGNOSTIC] textOrphan:
+line 1
+line 2
+line 3 modified by secondary
+[DEBUG 3WAY] textLCA: "line 1\nline 2\nline 3"
+[DEBUG 3WAY] textBase: "line 1 modified by main\nline 2\nline 3"
+[DEBUG 3WAY] textOrphan: "line 1\nline 2\nline 3 modified by secondary"
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft][MERGE DIAGNOSTIC] mergedText:
+line 1 modified by main
+line 2
+line 3 modified by secondary
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] newItemAddr: b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^CF54897B8592067ED69CEA3E33C303AFC3BB5928C49DBA314F9C19004C9B5AF5.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A (I: d23eef651b88be1248ee29ca179eff26)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] finalGraftTipAddr: b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^1A785FC0FBA94C3BBF37EA4E646D6078530A1CD6C640D184E10C128C0517C4E8.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A (I: 583ac81fb0a84827b85c3076ffeeaf26)
+[b2tfs-3way-merge-strategy][B2tFS3WayGraftStrategy][graft] complete. (I: 6c5d4e3f2a1b0c9d8e7f6a5b4c3d2e1f)
+[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^AB38A974ABDADC5F0DF8DDCE59A9F32A68B54C18CFBF44B2E431B5B96F640FC9.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^AB38A974ABDADC5F0DF8DDCE59A9F32A68B54C18CFBF44B2E431B5B96F640FC9.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^58C2E975A2B1894565D981510C606600750304F2EBF6493E678B4E911620EBB1.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 398c1e4bf61d7d486dc4475573788a71b9de99b00bfb086d6ac9381a8c83715b undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D69925152120B08634E348A9DEA431AE41B032E7BAAD85E7832BAF8192FB045E.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D69925152120B08634E348A9DEA431AE41B032E7BAAD85E7832BAF8192FB045E.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^58C2E975A2B1894565D981510C606600750304F2EBF6493E678B4E911620EBB1.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 398c1e4bf61d7d486dc4475573788a71b9de99b00bfb086d6ac9381a8c83715b undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^24DE146D76A91D4D39902D8085165A2C7B0581C828FEE66737DAB27EE117C8A0.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^24DE146D76A91D4D39902D8085165A2C7B0581C828FEE66737DAB27EE117C8A0.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C260FF6E69CF76EE606B524D61293F8C09845E73FB0F433805419613DA373310.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 528f676e3fe54dcae99e3ebaab01e1a8a26ca4e11185407a8e4acd0189489491 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^58C2E975A2B1894565D981510C606600750304F2EBF6493E678B4E911620EBB1.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^58C2E975A2B1894565D981510C606600750304F2EBF6493E678B4E911620EBB1.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C260FF6E69CF76EE606B524D61293F8C09845E73FB0F433805419613DA373310.856D4E5344197CDF633322514845F78277830A47F78531CB6FB6A7FBE4104E8A). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 528f676e3fe54dcae99e3ebaab01e1a8a26ca4e11185407a8e4acd0189489491 undefined undefined (W: 057baadca494473dabb26fb4fb879774)

package/src/engine/merge/b2tfs-3way-merge-strategy.respec.mts

@@ -0,0 +1,441 @@
+/**
+ * @module b2tfs-merge-strategy.respec.node
+ *
+ * In-memory respec unit tests for B2tFSItem3WayMergeStrategy.
+ */
+
+import {
+    respecfully, ifWe, ifWeMight, iReckon,
+    firstOfEach
+} from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
+import { hash } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { InnerSpace_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-v1.mjs';
+import { DEFAULT_INNER_SPACE_DATA_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-types.mjs';
+import { persistTransformResult, registerNewIbGib, getFromSpace, putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
+import { GraftPreference } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs';
+import { getBinIb } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
+import { BinIbGib_V1 } from '@ibgib/core-gib/dist/common/bin/bin-types.mjs';
+import { GraftStrategyService } from '@ibgib/core-gib/dist/sync/graft-info/graft-strategy-service.mjs';
+
+import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../item/item-helper.mjs';
+import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME, B2TFS_CHILD_ITEM_REL8N_NAME } from '../item/item-types.mjs';
+import { B2tFS3WayGraftStrategy, B2tFSItem3WayMergeStrategy } from './b2tfs-3way-merge-strategy.mjs';
+
+const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-merge-strategy.respec.node.mts]`;
+
+const graftStrategySvc = GraftStrategyService.instance;
+
+function binDataToText(data: any): string {
+    if (!data) { return ''; }
+    if (typeof data === 'string') { return data; }
+    if (typeof data.text === 'string') { return data.text; }
+    if (typeof data.data === 'string') { return data.data; }
+    if (data instanceof Uint8Array || Buffer.isBuffer(data)) {
+        return new TextDecoder('utf8').decode(data);
+    }
+    if (typeof data === 'object') {
+        const vals = Object.values(data);
+        const bytes = new Uint8Array(vals as number[]);
+        return new TextDecoder('utf8').decode(bytes);
+    }
+    return String(data);
+}
+
+async function createFileWithContent({
+    name,
+    content,
+    space,
+}: {
+    name: string;
+    content: string | Uint8Array;
+    space: any;
+}): Promise<B2tFSItemIbGib_V1> {
+    const textStr = typeof content === 'string' ? content : new TextDecoder('utf8').decode(content);
+    const dataBuffer = typeof content === 'string' ? Buffer.from(content, 'utf8') : content;
+    const fileHash = await hash({ s: textStr });
+
+    const fileExt = name.includes('.') ? name.split('.').pop() || 'txt' : 'txt';
+    const binIb = getBinIb({
+        binHash: fileHash,
+        binExt: fileExt,
+        binEncoding: 'utf8',
+    });
+
+    const binIbGib: BinIbGib_V1 = {
+        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 itemRes = await createB2tFSItemIbGib({
+        fsType: 'file',
+        name,
+        rel8ns: {
+            [BINARY_REL8N_NAME]: [binAddr],
+        },
+    });
+
+    await persistTransformResult({ resTransform: itemRes, space });
+    await registerNewIbGib({ ibGib: itemRes.newIbGib, space });
+
+    return itemRes.newIbGib as B2tFSItemIbGib_V1;
+}
+
+async function evolveFileContent({
+    existingItem,
+    newContent,
+    space,
+}: {
+    existingItem: B2tFSItemIbGib_V1;
+    newContent: string | Uint8Array;
+    space: any;
+}): Promise<B2tFSItemIbGib_V1> {
+    const textStr = typeof newContent === 'string' ? newContent : new TextDecoder('utf8').decode(newContent);
+    const dataBuffer = typeof newContent === 'string' ? Buffer.from(newContent, 'utf8') : newContent;
+    const fileHash = await hash({ s: textStr });
+
+    const fileExt = existingItem.data?.fileExt || (existingItem.data?.name?.includes('.') ? existingItem.data.name.split('.').pop() || 'txt' : 'txt');
+    const binIb = getBinIb({
+        binHash: fileHash,
+        binExt: fileExt,
+        binEncoding: 'utf8',
+    });
+
+    const binIbGib: BinIbGib_V1 = {
+        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 evolveRes = await evolveB2tFSItemIbGib({
+        existingItem,
+        rel8nsToUpdate: {
+            [BINARY_REL8N_NAME]: [binAddr],
+        },
+    });
+
+    await persistTransformResult({ resTransform: evolveRes, space });
+    await registerNewIbGib({ ibGib: evolveRes.newIbGib, space });
+
+    return evolveRes.newIbGib as B2tFSItemIbGib_V1;
+}
+
+async function createFolderItem({
+    name,
+    childAddrs,
+    space,
+}: {
+    name: string;
+    childAddrs: string[];
+    space: any;
+}): Promise<B2tFSItemIbGib_V1> {
+    const res = await createB2tFSItemIbGib({
+        fsType: 'folder',
+        name,
+        rel8ns: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
+        },
+    });
+
+    await persistTransformResult({ resTransform: res, space });
+    await registerNewIbGib({ ibGib: res.newIbGib, space });
+
+    return res.newIbGib as B2tFSItemIbGib_V1;
+}
+
+async function evolveFolderItem({
+    existingItem,
+    childAddrs,
+    space,
+}: {
+    existingItem: B2tFSItemIbGib_V1;
+    childAddrs: string[];
+    space: any;
+}): Promise<B2tFSItemIbGib_V1> {
+    const res = await evolveB2tFSItemIbGib({
+        existingItem,
+        rel8nsToUpdate: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
+        },
+        rel8nsToRemove: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: existingItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [],
+        },
+    });
+
+    await persistTransformResult({ resTransform: res, space });
+    await registerNewIbGib({ ibGib: res.newIbGib, space });
+
+    return res.newIbGib as B2tFSItemIbGib_V1;
+}
+
+await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () => {
+
+    firstOfEach(lc, async () => {
+        graftStrategySvc.reset();
+        graftStrategySvc.registerStrategy(new B2tFSItem3WayMergeStrategy());
+    });
+
+    await ifWe(lc, `performs non-conflicting line merges across two branch timelines`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_1',
+            uuid: 'test_space_uuid_1',
+        });
+        await space.initialized;
+
+        const initialText = "line 1\nline 2\nline 3";
+        const lcaFile = await createFileWithContent({ name: 'app.ts', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+
+        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+
+        // Base branch modifies line 1
+        const baseText = "line 1 modified by base\nline 2\nline 3";
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+
+        // Orphan branch modifies line 3
+        const orphanText = "line 1\nline 2\nline 3 modified by orphan";
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+
+        const graftResult = await graftStrategySvc.graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+        });
+
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+
+        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
+        const mergedFolder = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
+
+        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
+        iReckon(lc, mergedChildAddr).isGonnaBeTruthy();
+
+        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr!] });
+        const mergedFile = fileGet.ibGibs![0] as B2tFSItemIbGib_V1;
+
+        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
+        iReckon(lc, binAddr).isGonnaBeTruthy();
+
+        const binGet = await getFromSpace({ space, addrs: [binAddr!] });
+        const binIbGib = binGet.ibGibs![0];
+
+        const text = binDataToText(binIbGib.data);
+        iReckon(lc, text).includes('line 1 modified by base');
+        iReckon(lc, text).includes('line 2');
+        iReckon(lc, text).includes('line 3 modified by orphan');
+    });
+
+    await ifWe(lc, `inserts Git conflict markers on conflicting text line merges`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_2',
+            uuid: 'test_space_uuid_2',
+        });
+        await space.initialized;
+
+        const initialText = "line 1\nline 2\nline 3";
+        const lcaFile = await createFileWithContent({ name: 'index.ts', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+
+        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+
+        // Base modifies line 2
+        const baseText = "line 1\nline 2 base edit\nline 3";
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+
+        // Orphan modifies line 2 differently
+        const orphanText = "line 1\nline 2 orphan edit\nline 3";
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+
+        const graftResult = await graftStrategySvc.graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+        });
+
+        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
+        const mergedFolder = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
+
+        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
+        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr!] });
+        const mergedFile = fileGet.ibGibs![0] as B2tFSItemIbGib_V1;
+
+        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
+        const binGet = await getFromSpace({ space, addrs: [binAddr!] });
+        const binIbGib = binGet.ibGibs![0];
+
+        const text = binDataToText(binIbGib.data);
+        iReckon(lc, text).includes('<<<<<<< HEAD');
+        iReckon(lc, text).includes('line 2 base edit');
+        iReckon(lc, text).includes('=======');
+        iReckon(lc, text).includes('line 2 orphan edit');
+        iReckon(lc, text).includes('>>>>>>>');
+    });
+
+    await ifWe(lc, `skips line diff merging for non-text binary files`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_3',
+            uuid: 'test_space_uuid_3',
+        });
+        await space.initialized;
+
+        const lcaBinData = new Uint8Array([0x00, 0x01, 0x02, 0x03]);
+        const lcaFile = await createFileWithContent({ name: 'image.png', content: lcaBinData, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+
+        const lcaFolder = await createFolderItem({ name: 'assets', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+
+        const baseBinData = new Uint8Array([0x00, 0x01, 0x02, 0x04]);
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseBinData, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+
+        const orphanBinData = new Uint8Array([0x00, 0x01, 0x02, 0x05]);
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanBinData, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+
+        const graftResult = await graftStrategySvc.graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+        });
+
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+    });
+
+    await ifWe(lc, `respects GraftPreference.receiver by using timelineB (receiver) as baseTip`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_4',
+            uuid: 'test_space_uuid_4',
+        });
+        await space.initialized;
+
+        const initialText = "base content";
+        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "base edit", space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "orphan edit", space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+
+        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
+        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+
+        const graftResult = await graftStrategySvc.graftTimelines({
+            timelineAddrsA: timelineA_sender,
+            timelineAddrsB: timelineB_receiver,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            graftPreference: GraftPreference.receiver,
+        });
+
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(orphanFolderAddr);
+    });
+
+    await ifWe(lc, `respects GraftPreference.sender by using timelineA (sender) as baseTip`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_5',
+            uuid: 'test_space_uuid_5',
+        });
+        await space.initialized;
+
+        const initialText = "base content";
+        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "sender edit", space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "receiver edit", space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+
+        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
+        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+
+        const graftResult = await graftStrategySvc.graftTimelines({
+            timelineAddrsA: timelineA_sender,
+            timelineAddrsB: timelineB_receiver,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            graftPreference: GraftPreference.sender,
+        });
+
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(baseFolderAddr);
+    });
+});
+
+
+
+

package/src/engine/merge/b2tfs-3way-merge-types.mts

@@ -0,0 +1,42 @@
+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
+ *
+ * ## note on "Details"
+ *
+ * stupid word "details" is plural and I have this set to be an
+ * array. don't have the ability to refactor right now, so this will
+ * be mildly confusing unfortunately. Agents should not try to just
+ * refactor this on the fly.
+ */
+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;
+
+}

package/src/respec-gib.node.mts

@@ -1,12 +1,12 @@
 /**
  * @module respec-gib.node
- * 
+ *
  * Test runner for @ibgib/vcs-gib respec tests.
  */
 
 import { RespecNodeRunner } from '@ibgib/helper-gib/dist/respec-gib/respec-node-runner.mjs';
 
 const runner = new RespecNodeRunner({
-    respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
+    // respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
 });
 await runner.run();

package/tsconfig.json

@@ -13,6 +13,7 @@
   ],
   "exclude": [
     "node_modules",
-    "dist"
+    "**/*.respec.mts",
+    "./dist/**/*"
   ]
-}
+}

package/tsconfig.test.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist", /* Redirect output structure to the directory. */
+    "module": "ESNext", /* https://www.typescriptlang.org/docs/handbook/esm-node.html */
+  },
+  "exclude": [
+    "./dist"
+  ]
+}