@ibgib/core-gib 0.1.38 → 0.1.40

package/src/sync/sync-conflict-basic-multitimelines.respec.mts

@@ -216,7 +216,7 @@ await respecfully(sir, `Two different fields and rel8d`, async () => {
 
     // Verify Receiver has correct KV (Pre-Sync Check)
     // This ensures the conflict precondition exists.
-    await ifWeMight(sir, 'verify receiver KV pre-sync', async () => {
+    await ifWe(sir, 'verify receiver KV pre-sync', async () => {
         try {
             const destKV = await receiverCoordinator.getKnowledgeMap({
                 space: destSpace,
@@ -317,7 +317,7 @@ await respecfully(sir, `Two different fields and rel8d`, async () => {
             const resTip = await getFromSpace({ space: sourceSpace, addr: sourceTipAddr });
             const newTip = resTip.ibGibs![0] as IbGib_V1<TestData>;
 
-            await ifWeMight(sir, 'basics of alpha merge', async () => {
+            await ifWe(sir, 'basics of alpha merge', async () => {
                 iReckon(sir, sourceTipAddr).asTo(`Source Tip (${sourceTipAddr}) should NOT be alpha_v3_source_rel8beta`).not.isGonnaBe(getIbGibAddr({ ibGib: alpha_v3_source_rel8beta }));
                 iReckon(sir, sourceTipAddr).asTo(`Source Tip (${sourceTipAddr}) should NOT be v2dest`).not.isGonnaBe(getIbGibAddr({ ibGib: alpha_v2_dest }));
 
@@ -330,7 +330,7 @@ await respecfully(sir, `Two different fields and rel8d`, async () => {
             // Check Graft Structure
             // Look for 'graftinfo' rel8n
 
-            await ifWeMight(sir, 'graft info is valid', async () => {
+            await ifWe(sir, 'graft info is valid', async () => {
                 if (!newTip.rel8ns) { throw new Error(`(UNEXPECTED) newTip.rel8ns falsy? (E: eb4078712ea2f02c7ee84b983ed77826)`); }
                 const graftInfoRel = newTip.rel8ns[GRAFT_INFO_REL8N_NAME];
                 iReckon(sir, graftInfoRel).asTo('New Tip should have graftinfo rel8n').isGonnaBeTruthy();
@@ -354,7 +354,7 @@ await respecfully(sir, `Two different fields and rel8d`, async () => {
                 iReckon(sir, orphanRel![0]).asTo('orphan rel8ns will be later addr').isGonnaBe(orphanAddr);
             });
 
-            await ifWeMight(sir, 'alpha and deps synced', async () => {
+            await ifWe(sir, 'alpha and deps synced', async () => {
                 // alpha's full dep graph should exist on dest
                 const [beta_dest] = await getIbGibsFromCache_fallbackToSpaces({
                     addrs: [betaAddr_v0],
@@ -374,7 +374,7 @@ await respecfully(sir, `Two different fields and rel8d`, async () => {
                 }
             });
 
-            await ifWeMight(sir, 'beta and deps synced', async () => {
+            await ifWe(sir, 'beta and deps synced', async () => {
                 // beta's full dep graph should exist on dest
                 const [beta_dest] = await getIbGibsFromCache_fallbackToSpaces({
                     addrs: [betaAddr_v0],

package/src/sync/sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mts

@@ -253,7 +253,7 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1<InitializeSyncPeerInnersp
                         if (logalot) { console.log(`${lcPut} starting... (I: 4133e736b4c80d2cf94448b87b206826)`); }
 
                         // 2 seconds...i want to see huge blocks of logs entries for this to see this happening
-                        const delayMs = 20;
+                        const delayMs = 2;
                         for (let i = 0; i < 10; i++) {
                             console.warn(`${lc} ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)`)
                             await delay(delayMs);

package/src/sync/sync-saga-coordinator.mts

@@ -59,6 +59,7 @@ import { FlatIbGibGraph } from "../common/other/graph-types.mjs";
 import { graftTimelines, } from "./graft-info/graft-info-helpers.mjs";
 import { GRAFT_INFO_REL8N_NAME } from "./graft-info/graft-info-constants.mjs";
 import { GraftInfoIbGib_V1 } from "./graft-info/graft-info-types.mjs";
+import { validateIbGibIntrinsically } from "@ibgib/ts-gib/dist/V1/validate-helper.mjs";
 
 
 const logalot = GLOBAL_LOG_A_LOT;
@@ -234,11 +235,7 @@ export class SyncSagaCoordinator {
             }
         })();
 
-        return {
-            sagaId,
-            updates$,
-            done
-        };
+        return { sagaId, updates$, done };
     }
 
     /**
@@ -1674,7 +1671,7 @@ export class SyncSagaCoordinator {
             const { conflictStrategy } = sagaIbGib.data;
             const { deltaRequestAddrInfos, payloadAddrsDomain, proposeCommit, } = deltaData;
 
-            const peerProposesCommit = deltaData.proposeCommit || false;
+            const peerProposesCommit = deltaData.proposeCommit ?? false;
 
             /**
              * these are already in the local/receiver temp space
@@ -1723,8 +1720,12 @@ export class SyncSagaCoordinator {
                     // we need to get our own delta dep graph, based off of the
                     // LCA, and then we need to perform the optimistic graft
 
+                    if (unresolvedConflict.latestCommonFrameAddr) {
+
+                    }
+
                     const {
-                        latestCommonFrameAddr,
+                        // latestCommonFrameAddr, // is not defined yet
                         receiverKnowledgeTimelineAddrs,
                         senderKnowledgeTimelineAddrs,
                         reason,
@@ -1741,6 +1742,7 @@ export class SyncSagaCoordinator {
 
                     const depGraph = await getDependencyGraph({
                         ibGibAddrs: [receiverTipAddr],
+                        live: true,
                         space: mySpace,
                     });
                     const depGraphIbGibs = Object.values(depGraph);
@@ -1753,6 +1755,24 @@ export class SyncSagaCoordinator {
                         await registerNewIbGib({ ibGib: timelineIbGib, space: myTempSpace });
                     }
 
+
+                    // get the latest common point in the two timelines
+                    const latestCommonFrameAddr = senderKnowledgeTimelineAddrs.findLast(addrA => receiverKnowledgeTimelineAddrs.includes(addrA));
+                    if (!latestCommonFrameAddr) { throw new Error(`(UNEXPECTED) latestCommonFrameAddr falsy? how we can have a conflict without a common point in history? (E: 53de0a181838b3e5bf98d0887994b826)`); }
+
+                    // no matter what, we want to transmit our branch on this
+                    // end (the receiver). when grafting, it may end up being
+                    // orphaned, or it may end up being the base branch. Either
+                    // way, the sender does not have our (usually unique) delta
+                    // ibgibs.
+                    const ourDeltaDepGraph = await getDeltaDependencyGraph({
+                        ibGibAddr: unresolvedConflict.receiverTipAddr,
+                        latestCommonFrameAddr,
+                        live: true,
+                        space: mySpace,
+                    });
+                    Object.values(ourDeltaDepGraph).forEach(ourIbGib => outgoingPayload.push(ourIbGib));
+
                     /**
                      * ATOW (01/31/2026) on initial implementation, these are
                      * already persisted AND registered in the space
@@ -1767,6 +1787,8 @@ export class SyncSagaCoordinator {
                         space: myTempSpace,
                     });
 
+                    // need to get orphaned delta
+
                     const {
                         dnasCreatedInGraft,
                         dnasReplayed,
@@ -1775,7 +1797,9 @@ export class SyncSagaCoordinator {
                         graftInfoCreated,
                     } = resGraft;
 
+
                     unresolvedConflict.createdDnaAddrs = dnasCreatedInGraft.map(x => getIbGibAddr({ ibGib: x }));
+                    unresolvedConflict.replayedDnaAddrs = dnasReplayed.map(x => getIbGibAddr({ ibGib: x }));
                     unresolvedConflict.createdDomainAddrs = [
                         ...intermediateIbGibsCreatedInGraft.map(x => getIbGibAddr({ ibGib: x })),
                         getIbGibAddr({ ibGib: graftInfoCreated }),
@@ -1790,16 +1814,33 @@ export class SyncSagaCoordinator {
 
                     // add to ibgibs created in graft to both conflict info (via
                     // addrs) and the outgoingPayload
-                    unresolvedConflict.accretivePayloadAddrs ??= [];
-                    [
+
+                    const ibGibsCreatedOrReplayedInGraft = [
                         dnasCreatedInGraft,
+                        dnasReplayed,
                         intermediateIbGibsCreatedInGraft,
                         [graftInfoCreated, newGraftTip]
-                    ].forEach(
-                        ibGibsCreatedInGraft => ibGibsCreatedInGraft
+                    ];
+
+                    // #region debug
+                    for (const ibGib of ibGibsCreatedOrReplayedInGraft.flat()) {
+                        const validationErrors = await validateIbGibIntrinsically({ ibGib }) ?? [];
+                        if (validationErrors.length > 0) {
+                            console.dir(ibGib);
+                            debugger;
+                            console.log(pretty(ibGib));
+                        }
+                    }
+                    // #endregion debug
+
+                    unresolvedConflict.accretivePayloadAddrs ??= [];
+
+                    ibGibsCreatedOrReplayedInGraft.forEach(
+                        ibGibsCreatedOrReplayedInGraft => ibGibsCreatedOrReplayedInGraft
                             .forEach(ibGibCreated => {
                                 const addrCreated = getIbGibAddr({ ibGib: ibGibCreated });
-                                const alreadyExistsInAccretivePayloadAddrs = unresolvedConflict.accretivePayloadAddrs!.includes(addrCreated);
+                                const alreadyExistsInAccretivePayloadAddrs =
+                                    unresolvedConflict.accretivePayloadAddrs!.includes(addrCreated);
                                 if (!alreadyExistsInAccretivePayloadAddrs) {
                                     unresolvedConflict.accretivePayloadAddrs!.push(addrCreated)
                                 }
@@ -2121,13 +2162,14 @@ export class SyncSagaCoordinator {
                     });
                     const finalConflictGraftInfo = resGetGraftIbGibs.at(0) as GraftInfoIbGib_V1;
                     if (!finalConflictGraftInfo) { throw new Error(`(UNEXPECTED) couldn't get finalConflictGraftInfo from localTempSpace (${localTempSpace})? (E: 35e3c8130608d991e8fb295807812826)`); }
-                    const { createdDnaAddrs, createdDomainAddrs } = finalConflict;
+                    const { createdDnaAddrs, replayedDnaAddrs, createdDomainAddrs } = finalConflict;
                     if (!createdDnaAddrs || createdDnaAddrs.length === 0) { throw new Error(`(UNEXPECTED) finalConflict.createdDnaAddrs falsy/empty? (E: 9689f8be5bd19650b8d4a058b65db826)`); }
+                    if (!replayedDnaAddrs || replayedDnaAddrs.length === 0) { throw new Error(`(UNEXPECTED) finalConflict.replayedDnaAddrs falsy/empty? (E: f42878ed1cee3e9828567c5ab8179526)`); }
                     if (!createdDomainAddrs || createdDomainAddrs.length === 0) { throw new Error(`(UNEXPECTED) finalConflict.createdDomainAddrs falsy/empty? (E: cc41251d1acfe91a48d1b6080259ed26)`); }
 
                     /** throws if not all found */
                     const resGetCreated = await getIbGibsFromCache_fallbackToSpaces({
-                        addrs: [...createdDnaAddrs, ...createdDomainAddrs],
+                        addrs: [...createdDnaAddrs, ...replayedDnaAddrs, ...createdDomainAddrs],
                         space: localTempSpace,
                     });
                     resGetCreated.forEach(x => createdFromConflictGraftsIbGibs.push(x));
@@ -2343,6 +2385,8 @@ export class SyncSagaCoordinator {
                     metaspace,
                 });
 
+                // debugger; // edited on dest exists in myTempSpace and mySpace?
+
                 // todo: implement explicit cleanup logic here and in peer
                 console.error(`${lc} NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)`);
                 if (logalot) { console.log(`${lc} Peer committed. Finalizing saga locally. Saga Complete.`); }

package/src/sync/sync-saga-message/sync-saga-message-types.mts

@@ -211,6 +211,10 @@ export interface SyncSagaConflictInfo {
      * stage.
      */
     createdDnaAddrs?: IbGibAddr[];
+    /**
+     * dna ibgibs that were replayed to create the graft.
+     */
+    replayedDnaAddrs?: IbGibAddr[];
     /**
      * newly created ibgibs - IN ORDER - created as a result of a graft
      *