@ibgib/core-gib 0.1.60 → 0.1.61

package/dist/sync/sync-conflict-basic-divergence.withid.respec.mjs

@@ -0,0 +1,274 @@
+/**
+ * @module sync-conflict-basic-divergence.withid.respec
+ *
+ * Verifies Basic Divergence Conflict Resolution (optimistic merge / grafting) with Identity.
+ */
+import { respecfully, iReckon, ifWe } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+const maam = `[${import.meta.url}]`, sir = maam;
+import { clone, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
+import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
+import { getFromSpace } from '../witness/space/space-helper.mjs';
+import { Metaspace_Innerspace } from '../witness/space/metaspace/metaspace-innerspace/metaspace-innerspace.mjs';
+import { InnerSpace_V1 } from '../witness/space/inner-space/inner-space-v1.mjs';
+import { createTimelineRootTestHelper } from '../test-helpers.mjs';
+import { mut8Timeline } from '../timeline/timeline-api.mjs';
+import { DEFAULT_INNER_SPACE_DATA_V1 } from '../witness/space/inner-space/inner-space-types.mjs';
+import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
+import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
+import { getDependencyGraph, graphsAreEquivalent } from '../common/other/graph-helper.mjs';
+import { KeystoneService_V1 } from '../keystone/keystone-service-v1.mjs';
+import { KEYSTONE_VERB_SYNC, POOL_ID_SYNC, } from '../keystone/keystone-constants.mjs';
+import { createStandardPoolConfig } from '../keystone/keystone-config-builder.mjs';
+import { KeystoneReplenishStrategy } from '../keystone/keystone-types.mjs';
+import { SyncConflictStrategy } from './sync-constants.mjs';
+import { GRAFT_BASE_REL8N_NAME, GRAFT_ORPHAN_REL8N_NAME, GRAFT_INFO_REL8N_NAME } from './graft-info/graft-info-constants.mjs';
+import { getTjpAddr } from '../common/other/ibgib-helper.mjs';
+const logalot = GLOBAL_LOG_A_LOT || true;
+const lc = `[sync-conflict-basic-divergence.withid.respec]`;
+const SENDER_SECRET = 'test-sender-secret-conflict-basic-divergence-withid';
+const SENDER_IDENTITY_SYNC_POOL_CONFIG = createStandardPoolConfig({
+    id: POOL_ID_SYNC,
+    salt: 'senderidentitysyncsaltconflictbasicdivergencewithid',
+    verbs: [KEYSTONE_VERB_SYNC],
+    size: 200,
+    sequential: 1,
+    random: 1,
+    targetBinding: 2,
+    replenishStrategy: KeystoneReplenishStrategy.topUp,
+});
+await respecfully(sir, `Sync Conflict Basic Divergence with Identity`, async () => {
+    for (let i = 0; i <= 1; i++) {
+        const srcMakesFirstDivergentEdit = i === 0;
+        await respecfully(sir, `srcMakesFirstDivergentEdit: ${srcMakesFirstDivergentEdit}`, async () => {
+            // 1. Setup Spaces
+            const metaspace = new Metaspace_Innerspace(undefined);
+            await metaspace.initialize({
+                getFnAlert: () => async ({ title, msg }) => { console.log(`[Alert] ${title}: ${msg}`); },
+                getFnPrompt: () => async ({ title, msg }) => { console.log(`[Prompt] ${title}: ${msg}`); return ''; },
+                getFnPromptPassword: () => async (title, msg) => { console.log(`[PromptPwd] ${title}: ${msg}`); return null; },
+            });
+            while (!metaspace.initialized) {
+                await delay(10);
+            }
+            const defaultLocalUserSpace = await metaspace.getLocalUserSpace({ lock: false });
+            await defaultLocalUserSpace.initialized;
+            const sourceSpace = new InnerSpace_V1({
+                ...DEFAULT_INNER_SPACE_DATA_V1,
+                name: 'source',
+                uuid: 'source_uuid',
+                description: 'source test space',
+            });
+            await sourceSpace.initialized;
+            const destSpace = new InnerSpace_V1({
+                ...DEFAULT_INNER_SPACE_DATA_V1,
+                name: 'dest',
+                uuid: 'dest_uuid',
+                description: 'dest test space',
+            });
+            await destSpace.initialized;
+            // 2. Setup Identities
+            const keystoneSvc = new KeystoneService_V1();
+            const r1_senderIdentity_v0_source = await keystoneSvc.genesis({
+                masterSecret: SENDER_SECRET,
+                configs: [SENDER_IDENTITY_SYNC_POOL_CONFIG],
+                metaspace,
+                space: sourceSpace,
+            });
+            // Register identity in both spaces
+            await metaspace.put({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
+            await metaspace.registerNewIbGib({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
+            // 3. Seed Common History (V0 -> V1)
+            const testRoot = await createTimelineRootTestHelper({
+                ib: 'timeline_root_conflict_withid',
+                data: { type: 'testRoot', text: 'v0' },
+                space: sourceSpace,
+            });
+            const tjpAddr = getTjpAddr({ ibGib: testRoot, defaultIfNone: 'incomingAddr' }) ?? getIbGibAddr({ ibGib: testRoot });
+            // Create V1 (Common)
+            const v1_Common_onSource = await mut8Timeline({
+                timeline: testRoot,
+                mut8Opts: {
+                    mut8Ib: testRoot.ib + '_common',
+                    dataToAddOrPatch: { text: 'v1_common' }
+                },
+                metaspace,
+                space: sourceSpace,
+            });
+            // Sync testRoot and V1 to Dest immediately
+            const depGraphCommon = await getDependencyGraph({
+                ibGibAddrs: [tjpAddr],
+                space: sourceSpace,
+                live: true,
+            }) ?? {};
+            await metaspace.put({ ibGibs: Object.values(depGraphCommon), space: destSpace });
+            await metaspace.registerNewIbGib({ ibGib: testRoot, space: destSpace });
+            const resGetDest = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: v1_Common_onSource }) });
+            if (!resGetDest.success || !resGetDest.ibGibs || resGetDest.ibGibs.length === 0) {
+                throw new Error("Failed to copy V1 to Dest");
+            }
+            const v1_Common_onDest = resGetDest.ibGibs[0];
+            await metaspace.registerNewIbGib({ ibGib: v1_Common_onDest, space: destSpace });
+            // 4. Create Divergence (V2a vs V2b)
+            let v2a;
+            let v2b;
+            let baseAddr;
+            let orphanAddr;
+            if (srcMakesFirstDivergentEdit) {
+                // Source: V1 -> V2a (Edit Field A)
+                v2a = await mut8Timeline({
+                    timeline: v1_Common_onSource,
+                    mut8Opts: {
+                        mut8Ib: testRoot.ib + '_v2a',
+                        dataToAddOrPatch: { fieldA: 'source_edit' }
+                    },
+                    metaspace,
+                    space: sourceSpace,
+                });
+                baseAddr = getIbGibAddr({ ibGib: v2a });
+                await delay(16);
+                // Dest: V1 -> V2b (Edit Field B)
+                v2b = await mut8Timeline({
+                    timeline: v1_Common_onDest,
+                    mut8Opts: {
+                        mut8Ib: testRoot.ib + '_v2b',
+                        dataToAddOrPatch: { fieldB: 'dest_edit' }
+                    },
+                    metaspace,
+                    space: destSpace,
+                });
+                orphanAddr = getIbGibAddr({ ibGib: v2b });
+            }
+            else {
+                // Dest: V1 -> V2b (Edit Field B)
+                v2b = await mut8Timeline({
+                    timeline: v1_Common_onDest,
+                    mut8Opts: {
+                        mut8Ib: testRoot.ib + '_v2b',
+                        dataToAddOrPatch: { fieldB: 'dest_edit' }
+                    },
+                    metaspace,
+                    space: destSpace,
+                });
+                baseAddr = getIbGibAddr({ ibGib: v2b });
+                await delay(16);
+                // Source: V1 -> V2a (Edit Field A)
+                v2a = await mut8Timeline({
+                    timeline: v1_Common_onSource,
+                    mut8Opts: {
+                        mut8Ib: testRoot.ib + '_v2a',
+                        dataToAddOrPatch: { fieldA: 'source_edit' }
+                    },
+                    metaspace,
+                    space: sourceSpace,
+                });
+                orphanAddr = getIbGibAddr({ ibGib: v2a });
+            }
+            // 5. Setup Coordinators
+            const senderCoordinator = new SyncSagaCoordinator();
+            const receiverCoordinator = new SyncSagaCoordinator();
+            const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
+            await peer.initialized;
+            await peer.initializeOpts({
+                localMetaspace: metaspace,
+                localSpace: sourceSpace,
+                receiverSpace: destSpace,
+                receiverCoordinator,
+                receiverMetaspace: metaspace,
+            });
+            // 6. Run Sync with Identity
+            console.log(`${lc} Running Sync...`);
+            const resSync = await senderCoordinator.sync({
+                peer,
+                localSpace: sourceSpace,
+                metaspace,
+                domainIbGibs: [v2a],
+                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                senderIdentity: r1_senderIdentity_v0_source,
+                fnSenderSecret: async () => SENDER_SECRET,
+            });
+            await resSync.done;
+            // #region r1 verify post
+            await respecfully(sir, `r1 verify post`, async () => {
+                await ifWe(sir, `verify graft/merge tip contains both edits and graft relations`, async () => {
+                    const sourceKV = await senderCoordinator.getKnowledgeMap({
+                        space: sourceSpace,
+                        metaspace,
+                        domainIbGibs: [testRoot]
+                    });
+                    const sourceTipAddr = sourceKV[tjpAddr];
+                    iReckon(sir, sourceTipAddr).asTo('Source tip exists').isGonnaBeTruthy();
+                    if (sourceTipAddr) {
+                        iReckon(sir, sourceTipAddr).asTo('Tip should not be v2a').not.isGonnaBe(getIbGibAddr({ ibGib: v2a }));
+                        iReckon(sir, sourceTipAddr).asTo('Tip should not be v2b').not.isGonnaBe(getIbGibAddr({ ibGib: v2b }));
+                        const resTip = await getFromSpace({ space: sourceSpace, addr: sourceTipAddr });
+                        const newTip = resTip.ibGibs[0];
+                        iReckon(sir, newTip.data.fieldA).asTo('Merged fieldA').isGonnaBe('source_edit');
+                        iReckon(sir, newTip.data.fieldB).asTo('Merged fieldB').isGonnaBe('dest_edit');
+                        const graftInfoRel = newTip.rel8ns?.[GRAFT_INFO_REL8N_NAME];
+                        iReckon(sir, graftInfoRel).asTo('New Tip has graftinfo rel8n').isGonnaBeTruthy();
+                        if (graftInfoRel?.[0]) {
+                            const resGraft = await getFromSpace({ space: sourceSpace, addr: graftInfoRel[0] });
+                            const graftInfo = resGraft.ibGibs[0];
+                            const baseRel = graftInfo.rel8ns?.[GRAFT_BASE_REL8N_NAME];
+                            const orphanRel = graftInfo.rel8ns?.[GRAFT_ORPHAN_REL8N_NAME];
+                            iReckon(sir, baseRel?.[0]).asTo('Base matches').isGonnaBe(baseAddr);
+                            iReckon(sir, orphanRel?.[0]).asTo('Orphan matches').isGonnaBe(orphanAddr);
+                        }
+                    }
+                });
+                await ifWe(sir, 'sessionIdentity evolved the expected number of times', async () => {
+                    const latestS = peer.currentSessionIdentity;
+                    iReckon(sir, latestS).asTo('latest session identity exists').isGonnaBeTruthy();
+                    if (latestS) {
+                        console.log("ACTUAL SESSION IDENTITY N:", latestS.data?.n);
+                        iReckon(sir, latestS.data?.n).asTo('session identity data.n').isGonnaBe(3); // conflict resolution adds one
+                    }
+                });
+                await ifWe(sir, 'sender durable space has I (evolved frame)', async () => {
+                    const latestSenderIdentityAddr = await metaspace.getLatestAddr({
+                        addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
+                        space: sourceSpace,
+                    });
+                    iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
+                    if (latestSenderIdentityAddr) {
+                        const resGetSourceI = await getFromSpace({ space: sourceSpace, addr: latestSenderIdentityAddr });
+                        iReckon(sir, resGetSourceI.success && resGetSourceI.ibGibs?.length === 1).asTo('evolved I exists in sourceSpace').isGonnaBeTrue();
+                        if (resGetSourceI.success && resGetSourceI.ibGibs?.[0]) {
+                            const evolvedI = resGetSourceI.ibGibs[0];
+                            iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
+                        }
+                    }
+                });
+                await ifWe(sir, 'receiver durable space has I (evolved frame)', async () => {
+                    const latestSenderIdentityAddr = await metaspace.getLatestAddr({
+                        addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
+                        space: sourceSpace,
+                    });
+                    iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
+                    if (latestSenderIdentityAddr) {
+                        const resGetDestI = await getFromSpace({ space: destSpace, addr: latestSenderIdentityAddr });
+                        iReckon(sir, resGetDestI.success && resGetDestI.ibGibs?.length === 1).asTo('evolved I exists in destSpace').isGonnaBeTrue();
+                        if (resGetDestI.success && resGetDestI.ibGibs?.[0]) {
+                            const evolvedI = resGetDestI.ibGibs[0];
+                            iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
+                        }
+                    }
+                });
+                await ifWe(sir, 'session keystone dependency graphs are equivalent on source and dest', async () => {
+                    const latestS = peer.currentSessionIdentity;
+                    iReckon(sir, latestS).asTo('latestS exists').isGonnaBeTruthy();
+                    if (latestS) {
+                        const depGraphSource = await getDependencyGraph({ ibGib: latestS, space: sourceSpace });
+                        const depGraphDest = await getDependencyGraph({ ibGib: latestS, space: destSpace });
+                        const equal = graphsAreEquivalent({ graphA: depGraphSource, graphB: depGraphDest });
+                        iReckon(sir, equal).asTo('session graphs are equivalent').isGonnaBeTrue();
+                    }
+                });
+            });
+            // #endregion r1 verify post
+        });
+    }
+});
+//# sourceMappingURL=sync-conflict-basic-divergence.withid.respec.mjs.map

package/dist/sync/sync-conflict-basic-divergence.withid.respec.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-conflict-basic-divergence.withid.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict-basic-divergence.withid.respec.mts"],"names":[],"mappings":"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"}

package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.d.mts

@@ -0,0 +1,8 @@
+/**
+ * @module sync-conflict-basic-multitimelines.withid.respec
+ *
+ * Verifies Divergence Conflict Resolution (optimistic merge / grafting) with Identity
+ * when multiple related timelines are involved.
+ */
+export {};
+//# sourceMappingURL=sync-conflict-basic-multitimelines.withid.respec.d.mts.map

package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-conflict-basic-multitimelines.withid.respec.d.mts","sourceRoot":"","sources":["../../src/sync/sync-conflict-basic-multitimelines.withid.respec.mts"],"names":[],"mappings":"AAAA;;;;;GAKG"}

package/dist/sync/sync-conflict-basic-multitimelines.withid.respec.mjs

@@ -0,0 +1,322 @@
+/**
+ * @module sync-conflict-basic-multitimelines.withid.respec
+ *
+ * Verifies Divergence Conflict Resolution (optimistic merge / grafting) with Identity
+ * when multiple related timelines are involved.
+ */
+import { respecfully, iReckon, ifWe } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+const maam = `[${import.meta.url}]`, sir = maam;
+import { clone, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
+import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
+import { getFromSpace } from '../witness/space/space-helper.mjs';
+import { Metaspace_Innerspace } from '../witness/space/metaspace/metaspace-innerspace/metaspace-innerspace.mjs';
+import { InnerSpace_V1 } from '../witness/space/inner-space/inner-space-v1.mjs';
+import { createTimelineRootTestHelper } from '../test-helpers.mjs';
+import { appendToTimeline, mut8Timeline } from '../timeline/timeline-api.mjs';
+import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
+import { DEFAULT_INNER_SPACE_DATA_V1 } from '../witness/space/inner-space/inner-space-types.mjs';
+import { getIbGibsFromCache_fallbackToSpaces, getTjpAddr } from '../common/other/ibgib-helper.mjs';
+import { getDependencyGraph, graphsAreEquivalent } from '../common/other/graph-helper.mjs';
+import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from './sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
+import { SyncConflictStrategy } from './sync-constants.mjs';
+import { GRAFT_BASE_REL8N_NAME, GRAFT_ORPHAN_REL8N_NAME, GRAFT_INFO_REL8N_NAME } from './graft-info/graft-info-constants.mjs';
+import { KeystoneService_V1 } from '../keystone/keystone-service-v1.mjs';
+import { KEYSTONE_VERB_SYNC, POOL_ID_SYNC, } from '../keystone/keystone-constants.mjs';
+import { createStandardPoolConfig } from '../keystone/keystone-config-builder.mjs';
+import { KeystoneReplenishStrategy } from '../keystone/keystone-types.mjs';
+const logalot = GLOBAL_LOG_A_LOT || false;
+const lc = `[sync-conflict-basic-multitimelines.withid.respec]`;
+const SENDER_SECRET = 'test-sender-secret-conflict-basic-multitimelines-withid';
+const SENDER_IDENTITY_SYNC_POOL_CONFIG = createStandardPoolConfig({
+    id: POOL_ID_SYNC,
+    salt: 'senderidentitysyncsaltconflictbasicmultitimelineswithid',
+    verbs: [KEYSTONE_VERB_SYNC],
+    size: 200,
+    sequential: 1,
+    random: 1,
+    targetBinding: 2,
+    replenishStrategy: KeystoneReplenishStrategy.topUp,
+});
+const TEST_REL8N_NAME = 'testrel8n';
+await respecfully(sir, `Sync Conflict Basic Multitimelines with Identity`, async () => {
+    for (let i = 0; i <= 1; i++) {
+        const srcMakesFirstDivergentEdit = i === 0;
+        await respecfully(sir, `srcMakesFirstDivergentEdit: ${srcMakesFirstDivergentEdit}`, async () => {
+            // 1. Setup Spaces
+            const metaspace = new Metaspace_Innerspace(undefined);
+            await metaspace.initialize({
+                getFnAlert: () => async ({ title, msg }) => { console.log(`[Alert] ${title}: ${msg}`); },
+                getFnPrompt: () => async ({ title, msg }) => { console.log(`[Prompt] ${title}: ${msg}`); return ''; },
+                getFnPromptPassword: () => async (title, msg) => { console.log(`[PromptPwd] ${title}: ${msg}`); return null; },
+            });
+            while (!metaspace.initialized) {
+                await delay(10);
+            }
+            const defaultLocalUserSpace = await metaspace.getLocalUserSpace({ lock: false });
+            await defaultLocalUserSpace.initialized;
+            const sourceSpace = new InnerSpace_V1({
+                ...DEFAULT_INNER_SPACE_DATA_V1,
+                name: 'source',
+                uuid: 'source_uuid',
+                description: 'source test space',
+            });
+            await sourceSpace.initialized;
+            const destSpace = new InnerSpace_V1({
+                ...DEFAULT_INNER_SPACE_DATA_V1,
+                name: 'dest',
+                uuid: 'dest_uuid',
+                description: 'dest test space',
+            });
+            await destSpace.initialized;
+            // 2. Setup Identities
+            const keystoneSvc = new KeystoneService_V1();
+            const r1_senderIdentity_v0_source = await keystoneSvc.genesis({
+                masterSecret: SENDER_SECRET,
+                configs: [SENDER_IDENTITY_SYNC_POOL_CONFIG],
+                metaspace,
+                space: sourceSpace,
+            });
+            // Register identity in both spaces
+            await metaspace.put({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
+            await metaspace.registerNewIbGib({ ibGib: r1_senderIdentity_v0_source, space: destSpace });
+            // 3. Seed Common History (V0 -> V1)
+            const alpha_v0 = await createTimelineRootTestHelper({
+                ib: 'alpha_multitimelines_withid',
+                data: { type: 'alpha', },
+                space: sourceSpace,
+            });
+            const tjpAddr = getTjpAddr({ ibGib: alpha_v0, defaultIfNone: 'incomingAddr' }) ?? getIbGibAddr({ ibGib: alpha_v0 });
+            // Create v1 (common)
+            const alpha_v1_common_onSource = await mut8Timeline({
+                timeline: alpha_v0,
+                mut8Opts: {
+                    mut8Ib: alpha_v0.ib + '_common',
+                    dataToAddOrPatch: { commonField: 'common yo' }
+                },
+                metaspace,
+                space: sourceSpace,
+            });
+            // Sync alpha to dest immediately
+            const depGraph_alpha_v1Andcommon = await getDependencyGraph({
+                ibGibAddrs: [tjpAddr],
+                space: sourceSpace,
+                live: true,
+            }) ?? {};
+            await metaspace.put({ ibGibs: Object.values(depGraph_alpha_v1Andcommon), space: destSpace });
+            await metaspace.registerNewIbGib({ ibGib: alpha_v0, space: destSpace });
+            const resGetDest = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: alpha_v1_common_onSource }) });
+            if (!resGetDest.success || !resGetDest.ibGibs || resGetDest.ibGibs.length === 0) {
+                throw new Error("Failed to copy V1 to Dest");
+            }
+            const alpha_v1_common_onDest = resGetDest.ibGibs[0];
+            await metaspace.registerNewIbGib({ ibGib: alpha_v1_common_onDest, space: destSpace });
+            // 4. Create Divergences (V2a vs V2b)
+            let alpha_v3_source_rel8beta;
+            let alpha_v2_dest;
+            let baseAddr;
+            let orphanAddr;
+            let beta_v0_source;
+            let betaAddr_v0;
+            // Beta is created on source
+            beta_v0_source = await createTimelineRootTestHelper({
+                ib: 'beta_multitimelines_withid',
+                data: {
+                    fieldA: 'beta field A created on source',
+                },
+                space: sourceSpace,
+            });
+            betaAddr_v0 = getIbGibAddr({ ibGib: beta_v0_source });
+            if (srcMakesFirstDivergentEdit) {
+                // Source: V1 -> V2a (Edit Field A + Rel8 Beta)
+                const alpha_v2_source_sansBeta = await mut8Timeline({
+                    timeline: alpha_v1_common_onSource,
+                    mut8Opts: {
+                        mut8Ib: alpha_v0.ib + '_v2source',
+                        dataToAddOrPatch: { fieldA: 'source_edit' }
+                    },
+                    metaspace,
+                    space: sourceSpace,
+                });
+                alpha_v3_source_rel8beta = await appendToTimeline({
+                    timeline: alpha_v2_source_sansBeta,
+                    metaspace,
+                    space: sourceSpace,
+                    rel8nInfos: [
+                        { rel8nName: TEST_REL8N_NAME, ibGibs: [beta_v0_source] }
+                    ],
+                });
+                baseAddr = getIbGibAddr({ ibGib: alpha_v3_source_rel8beta });
+                await delay(16);
+                // Dest: V1 -> V2b (Edit Field B)
+                alpha_v2_dest = await mut8Timeline({
+                    timeline: alpha_v1_common_onDest,
+                    mut8Opts: {
+                        mut8Ib: alpha_v0.ib + '_v2dest',
+                        dataToAddOrPatch: { fieldB: 'dest_edit' }
+                    },
+                    metaspace,
+                    space: destSpace,
+                });
+                orphanAddr = getIbGibAddr({ ibGib: alpha_v2_dest });
+            }
+            else {
+                // Dest: V1 -> V2b (Edit Field B)
+                alpha_v2_dest = await mut8Timeline({
+                    timeline: alpha_v1_common_onDest,
+                    mut8Opts: {
+                        mut8Ib: alpha_v0.ib + '_v2dest',
+                        dataToAddOrPatch: { fieldB: 'dest_edit' }
+                    },
+                    metaspace,
+                    space: destSpace,
+                });
+                baseAddr = getIbGibAddr({ ibGib: alpha_v2_dest });
+                await delay(16);
+                // Source: V1 -> V2a (Edit Field A + Rel8 Beta)
+                const alpha_v2_source_sansBeta = await mut8Timeline({
+                    timeline: alpha_v1_common_onSource,
+                    mut8Opts: {
+                        mut8Ib: alpha_v0.ib + '_v2source',
+                        dataToAddOrPatch: { fieldA: 'source_edit' }
+                    },
+                    metaspace,
+                    space: sourceSpace,
+                });
+                alpha_v3_source_rel8beta = await appendToTimeline({
+                    timeline: alpha_v2_source_sansBeta,
+                    metaspace,
+                    space: sourceSpace,
+                    rel8nInfos: [
+                        { rel8nName: TEST_REL8N_NAME, ibGibs: [beta_v0_source] }
+                    ],
+                });
+                orphanAddr = getIbGibAddr({ ibGib: alpha_v3_source_rel8beta });
+            }
+            // 5. Setup Coordinators
+            const senderCoordinator = new SyncSagaCoordinator();
+            const receiverCoordinator = new SyncSagaCoordinator();
+            const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
+            await peer.initialized;
+            await peer.initializeOpts({
+                localMetaspace: metaspace,
+                localSpace: sourceSpace,
+                receiverSpace: destSpace,
+                receiverCoordinator,
+                receiverMetaspace: metaspace,
+            });
+            // 6. Run Sync with Identity
+            console.log(`${lc} Running Sync...`);
+            const resSync = await senderCoordinator.sync({
+                peer,
+                localSpace: sourceSpace,
+                metaspace,
+                domainIbGibs: [alpha_v3_source_rel8beta],
+                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                senderIdentity: r1_senderIdentity_v0_source,
+                fnSenderSecret: async () => SENDER_SECRET,
+            });
+            await resSync.done;
+            console.log(`${lc} Sync finished.`);
+            // 7. Verify merge & related timelines
+            await respecfully(sir, `verify merge and related timelines`, async () => {
+                await ifWe(sir, `verify graft/merge tip contains both edits and graft relations`, async () => {
+                    const sourceKV = await senderCoordinator.getKnowledgeMap({
+                        space: sourceSpace,
+                        metaspace,
+                        domainIbGibs: [alpha_v0]
+                    });
+                    const sourceTipAddr = sourceKV[tjpAddr];
+                    iReckon(sir, sourceTipAddr).asTo('Source tip exists').isGonnaBeTruthy();
+                    if (sourceTipAddr) {
+                        iReckon(sir, sourceTipAddr).asTo('Tip should not be baseAddr').not.isGonnaBe(baseAddr);
+                        iReckon(sir, sourceTipAddr).asTo('Tip should not be orphanAddr').not.isGonnaBe(orphanAddr);
+                        const resTip = await getFromSpace({ space: sourceSpace, addr: sourceTipAddr });
+                        const newTip = resTip.ibGibs[0];
+                        iReckon(sir, newTip.data.fieldA).asTo('Merged fieldA').isGonnaBe('source_edit');
+                        iReckon(sir, newTip.data.fieldB).asTo('Merged fieldB').isGonnaBe('dest_edit');
+                        const graftInfoRel = newTip.rel8ns?.[GRAFT_INFO_REL8N_NAME];
+                        iReckon(sir, graftInfoRel).asTo('New Tip has graftinfo rel8n').isGonnaBeTruthy();
+                        if (graftInfoRel?.[0]) {
+                            const resGraft = await getFromSpace({ space: sourceSpace, addr: graftInfoRel[0] });
+                            const graftInfo = resGraft.ibGibs[0];
+                            const baseRel = graftInfo.rel8ns?.[GRAFT_BASE_REL8N_NAME];
+                            const orphanRel = graftInfo.rel8ns?.[GRAFT_ORPHAN_REL8N_NAME];
+                            iReckon(sir, baseRel).asTo('Graft Base exists').isGonnaBeTruthy();
+                            iReckon(sir, orphanRel).asTo('Graft Orphan exists').isGonnaBeTruthy();
+                            iReckon(sir, baseRel.at(-1)).asTo('base rel8ns final addr will be baseAddr').isGonnaBe(baseAddr);
+                            iReckon(sir, orphanRel.at(-1)).asTo('orphan rel8ns final addr will be orphanAddr').isGonnaBe(orphanAddr);
+                        }
+                    }
+                });
+                await ifWe(sir, 'related timeline beta is synced to destSpace and graphs match', async () => {
+                    const [beta_dest] = await getIbGibsFromCache_fallbackToSpaces({
+                        addrs: [betaAddr_v0],
+                        space: destSpace,
+                    });
+                    iReckon(sir, beta_dest).asTo('beta exists in dest').isGonnaBeTruthy();
+                    if (beta_dest) {
+                        const depGraph_beta_source = await getDependencyGraph({ ibGib: beta_v0_source, space: sourceSpace });
+                        const depGraph_beta_dest = await getDependencyGraph({ ibGib: beta_dest, space: destSpace });
+                        const betaDepsAreEqual = graphsAreEquivalent({
+                            graphA: depGraph_beta_source,
+                            graphB: depGraph_beta_dest,
+                            slowButThorough: true,
+                        });
+                        iReckon(sir, betaDepsAreEqual).asTo('beta dependencies are fully synced').isGonnaBeTrue();
+                    }
+                });
+                await ifWe(sir, 'sessionIdentity evolved the expected number of times', async () => {
+                    const latestS = peer.currentSessionIdentity;
+                    iReckon(sir, latestS).asTo('latest session identity exists').isGonnaBeTruthy();
+                    if (latestS) {
+                        console.log("ACTUAL SESSION IDENTITY N:", latestS.data?.n);
+                        iReckon(sir, latestS.data?.n).asTo('session identity data.n').isGonnaBe(3);
+                    }
+                });
+                await ifWe(sir, 'sender durable space has I (evolved frame)', async () => {
+                    const latestSenderIdentityAddr = await metaspace.getLatestAddr({
+                        addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
+                        space: sourceSpace,
+                    });
+                    iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
+                    if (latestSenderIdentityAddr) {
+                        const resGetSourceI = await getFromSpace({ space: sourceSpace, addr: latestSenderIdentityAddr });
+                        iReckon(sir, resGetSourceI.success && resGetSourceI.ibGibs?.length === 1).asTo('evolved I exists in sourceSpace').isGonnaBeTrue();
+                        if (resGetSourceI.success && resGetSourceI.ibGibs?.[0]) {
+                            const evolvedI = resGetSourceI.ibGibs[0];
+                            iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
+                        }
+                    }
+                });
+                await ifWe(sir, 'receiver durable space has I (evolved frame)', async () => {
+                    const latestSenderIdentityAddr = await metaspace.getLatestAddr({
+                        addr: getIbGibAddr({ ibGib: r1_senderIdentity_v0_source }),
+                        space: sourceSpace,
+                    });
+                    iReckon(sir, latestSenderIdentityAddr).asTo('latestSenderIdentityAddr exists').isGonnaBeTruthy();
+                    if (latestSenderIdentityAddr) {
+                        const resGetDestI = await getFromSpace({ space: destSpace, addr: latestSenderIdentityAddr });
+                        iReckon(sir, resGetDestI.success && resGetDestI.ibGibs?.length === 1).asTo('evolved I exists in destSpace').isGonnaBeTrue();
+                        if (resGetDestI.success && resGetDestI.ibGibs?.[0]) {
+                            const evolvedI = resGetDestI.ibGibs[0];
+                            iReckon(sir, evolvedI.data?.n).asTo('evolved I data.n').isGonnaBe(1);
+                        }
+                    }
+                });
+                await ifWe(sir, 'session keystone dependency graphs are equivalent on source and dest', async () => {
+                    const latestS = peer.currentSessionIdentity;
+                    iReckon(sir, latestS).asTo('latestS exists').isGonnaBeTruthy();
+                    if (latestS) {
+                        const depGraphSource = await getDependencyGraph({ ibGib: latestS, space: sourceSpace });
+                        const depGraphDest = await getDependencyGraph({ ibGib: latestS, space: destSpace });
+                        const equal = graphsAreEquivalent({ graphA: depGraphSource, graphB: depGraphDest });
+                        iReckon(sir, equal).asTo('session graphs are equivalent').isGonnaBeTrue();
+                    }
+                });
+            });
+        });
+    }
+});
+//# sourceMappingURL=sync-conflict-basic-multitimelines.withid.respec.mjs.map