@ibgib/core-gib 0.1.28 → 0.1.29

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

@@ -29,11 +29,9 @@ import {
     SyncData_V1, SyncIbGib_V1, SyncConflictStrategy, SyncMode, SyncOptions,
     SyncRel8ns_V1, DomainIbGibAnalysisInfo, NextSagaFrameInfo,
     SYNC_CONFLICT_STRATEGY_VALID_VALUES, HandleSagaResponseContextResult,
-    SyncExecutionContext,
-    SYNC_EXECUTION_CONTEXT_VALID_VALUES,
     SyncSagaFrameDependencyGraph,
 } from "./sync-types.mjs";
-import { getExecutionContext, getFullSyncSagaHistory, getSyncIb, getTempSpaceName, isPastFrame, putInSpace_dnasThenNonDnas, validateFullSyncSagaHistory } from "./sync-helpers.mjs";
+import { getSyncSagaFrameOrigin, getFullSyncSagaHistory, getSyncIb, getTempSpaceName, isPastFrame, putInSpace_dnasThenNonDnas, validateFullSyncSagaHistory } from "./sync-helpers.mjs";
 import { getDeltaDependencyGraph, getDependencyGraph, toFlatGraph } from "../common/other/graph-helper.mjs";
 import {
     SyncSagaMessageData_V1, SyncSagaMessageInitData_V1,
@@ -58,9 +56,8 @@ import { IbGibSpaceResultData, IbGibSpaceResultIbGib, IbGibSpaceResultRel8ns } f
 import { FlatIbGibGraph } from "../common/other/graph-types.mjs";
 
 
-// const logalot = GLOBAL_LOG_A_LOT || true;
-const logalot = true;
-const logalotControlDomain = true;
+const logalot = GLOBAL_LOG_A_LOT;
+const logalotControlDomain = false;
 const lcControlDomain = '[ControlDomain]';
 
 /**
@@ -505,7 +502,11 @@ export class SyncSagaCoordinator {
             });
 
             if (!contextResult) {
-                if (logalot) { console.log(`${lc} Handler returned null (Saga End). (I: faae22abc818ba9b28ac6d2881cd7826)`); }
+                // should this ever hit?
+                console.error(`${lc} NAG ERROR (DOES NOT THROW): does this ever hit now? (E: e04d02efc2a8e72a88b79f1f0f95ca26)`);
+                break;
+            } else if (contextResult.nextFrameInfo?.sagaComplete) {
+                if (logalot) { console.log(`${lc} Handler returned null (Saga End). (I: 123bf9e7dca8886de72553a8d4f29e26)`); }
                 break;
             }
 
@@ -514,8 +515,6 @@ export class SyncSagaCoordinator {
                 throw new Error(`Couldn't handle response saga context. errorMsg: ${contextResult.errorMsg} (E: c948e81d513b2a0eb8b8afa878edc626)`);
             } else if (!contextResult.nextFrameInfo) {
                 throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo falsy? (E: c287a82e823e662a77923278e2418826)`);
-            } else if (contextResult.nextFrameInfo?.sagaComplete) {
-                throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo.sagaComplete? logic flow should not have gotten here. (E: 104a32381db816b7183435e805b3d626)`);
             }
             // #endregion error conditions throw
 
@@ -901,15 +900,18 @@ export class SyncSagaCoordinator {
                         sagaContext,
                         sagaIbGib,
                         srcGraph,
-                        metaspace,
-                        mySpace,
-                        myTempSpace,
+                        metaspace, mySpace, myTempSpace,
                         identity,
                     });
                     break;
 
                 case SyncStage.commit:
-                    nextFrameInfo = await this.handleCommitFrame({ sagaIbGib, metaspace, mySpace: mySpace, myTempSpace: myTempSpace, identity, });
+                    if (logalot) { console.log(`${lc}[${getSyncSagaFrameOrigin({ sagaFrame: sagaIbGib })}] mySpace.ib: ${mySpace.ib} (I: 5b270996d848907238d817fffa64a126)`); }
+                    nextFrameInfo = await this.handleCommitFrame({
+                        sagaIbGib,
+                        metaspace, mySpace, myTempSpace,
+                        identity,
+                    });
                     break;
 
                 default:
@@ -973,7 +975,7 @@ export class SyncSagaCoordinator {
         try {
             if (logalot) { console.log(`${lc} starting... (I: 9d88dcad0408c029e898a4bcf3b08426)`); }
 
-            console.log(`${lc} [TEST DEBUG] Receiver mySpace: ${mySpace.ib}`);
+            if (logalot) { console.log(`${lc} [TEST DEBUG] Receiver mySpace: ${mySpace.ib}`); }
 
             // Extract Init Data
             const initData = messageData as SyncSagaMessageInitData_V1; // Using renamed variable for clarity
@@ -1018,7 +1020,7 @@ export class SyncSagaCoordinator {
             const remoteKV = initData.knowledgeVector;
             if (logalot) { console.log(`${lc} remoteKV: ${pretty(remoteKV)} (I: 9f957862356dfeae183c200854e86e26)`); }
             const remoteTjps = Object.keys(remoteKV);
-            console.log(`${lc} [TEST DEBUG] remoteTjps: ${JSON.stringify(remoteTjps)}`);
+            if (logalot) { console.log(`${lc} [TEST DEBUG] remoteTjps: ${JSON.stringify(remoteTjps)}`); }
             if (logalot) { console.log(`${lc} remoteTjps: ${pretty(remoteTjps)} (I: 86ea4c53db0dc184c8b253386c402126)`); }
 
             // 1. Get Local Latest Addrs for all TJPs
@@ -1032,7 +1034,7 @@ export class SyncSagaCoordinator {
                 if (!resGetLatestAddrs.data) { throw new Error(`(UNEXPECTED) resGetLatestAddrs.data falsy? (E: b180d813c088042b38e1e02e06a16926)`); }
                 if (!resGetLatestAddrs.data.latestAddrsMap) { throw new Error(`(UNEXPECTED) resGetLatestAddrs.data.latestAddrsMap falsy? (E: 16bc386dd51d0ff53a49620b1e641826)`); }
                 localLatestAddrsMap = resGetLatestAddrs.data.latestAddrsMap;
-                console.log(`${lc} [TEST DEBUG] localKV: ${JSON.stringify(localLatestAddrsMap)}`);
+                if (logalot) { console.log(`${lc} [TEST DEBUG] localKV: ${JSON.stringify(localLatestAddrsMap)}`); }
                 if (logalot) { console.log(`${lc} localKV: ${pretty(localLatestAddrsMap)} (I: 980975642cbccd8018cf0cd808d30826)`); }
             }
 
@@ -1043,7 +1045,7 @@ export class SyncSagaCoordinator {
 
                 if (!localAddr) {
                     // We (Receiver) don't have this timeline at all. Request it.
-                    console.log(`${lc} [TEST DEBUG] Missing local timeline for TJP: ${tjp}. Requesting remoteAddr: ${remoteAddr}`);
+                    if (logalot) { console.log(`${lc} [TEST DEBUG] Missing local timeline for TJP: ${tjp}. Requesting remoteAddr: ${remoteAddr}`); }
                     deltaRequestAddrInfos.push({
                         addr: remoteAddr,
                         tjpAddr: tjp,
@@ -1057,10 +1059,10 @@ export class SyncSagaCoordinator {
 
                 if (localAddr === remoteAddr) {
                     // ...already synced
-                    console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Synced (localAddr === remoteAddr)`);
+                    if (logalot) { console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Synced (localAddr === remoteAddr)`); }
                     continue;
                 }
-                console.log(`${lc} [TEST DEBUG] TJP ${tjp}: localAddr=${localAddr}, remoteAddr=${remoteAddr} - checking for divergence...`);
+                if (logalot) { console.log(`${lc} [TEST DEBUG] TJP ${tjp}: localAddr=${localAddr}, remoteAddr=${remoteAddr} - checking for divergence...`); }
 
                 // we have this timeline but it's not synced...
 
@@ -1076,7 +1078,7 @@ export class SyncSagaCoordinator {
                 if (remoteIsInPast) {
                     // we're ahead, so push the delta of what the sender doesn't
                     // have (we have full knowledge)
-                    console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Remote (sender) is in past - offering push`);
+                    if (logalot) { console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Remote (sender) is in past - offering push`); }
                     const deltaGraph = await getDeltaDependencyGraph({
                         ibGibAddr: localAddr,
                         live: false, // always live: false right?
@@ -1110,7 +1112,7 @@ export class SyncSagaCoordinator {
 
                     if (localIsInPast) {
                         // Fast-Forward: We update to remote's tip.
-                        console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Local is in past - requesting delta`);
+                        if (logalot) { console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Local is in past - requesting delta`); }
                         deltaRequestAddrInfos.push({
                             addr: remoteAddr,
                             tjpAddr: tjp,
@@ -1118,7 +1120,7 @@ export class SyncSagaCoordinator {
                         });
                     } else {
                         // DIVERGENCE: Both have changes the other doesn't know about.
-                        console.log(`${lc} [TEST DEBUG] TJP ${tjp}: DIVERGENCE DETECTED! conflictStrategy=${conflictStrategy}`);
+                        if (logalot) { console.log(`${lc} [TEST DEBUG] TJP ${tjp}: DIVERGENCE DETECTED! conflictStrategy=${conflictStrategy}`); }
 
                         if (conflictStrategy === 'abort') {
                             // Abort Strategy: We will treat this as terminal.
@@ -1339,14 +1341,14 @@ export class SyncSagaCoordinator {
 
             // 1. Check for Conflicts
             const conflicts = ackData.conflicts || [];
-            console.log(`${lc} [CONFLICT DEBUG] Received conflicts from Ack: ${conflicts.length}`);
-            if (conflicts.length > 0) {
+            if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Received conflicts from Ack: ${conflicts.length}`); }
+            if (logalot && conflicts.length > 0) {
                 console.log(`${lc} [CONFLICT DEBUG] Conflicts detail: ${JSON.stringify(conflicts, null, 2)}`);
             }
 
             const terminalConflicts = conflicts.filter(c => c.terminal);
             if (terminalConflicts.length > 0) {
-                console.warn(`${lc} Received terminal conflicts from Ack: ${JSON.stringify(terminalConflicts)}`);
+                if (logalot) { console.warn(`${lc} Received terminal conflicts from Ack: ${JSON.stringify(terminalConflicts)}`); }
                 // Terminal failure. Sender should probably Commit(Fail) or just Abort.
                 // For now, throw to trigger abort.
                 throw new Error(`${lc} Peer reported terminal conflicts. (E: 23a0096ee05a2ccfa89334e8f156b426)`);
@@ -1362,7 +1364,7 @@ export class SyncSagaCoordinator {
             const outgoingDeltaAddrRequestInfos: SyncSagaRequestAddrInfo[] = []; // Additional requests for merging
 
             if (conflicts.length > 0) {
-                console.log(`${lc} [CONFLICT DEBUG] Processing ${conflicts.length} non-terminal conflicts`);
+                if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Processing ${conflicts.length} non-terminal conflicts`); }
                 // We need to resolve these.
                 // Strategy:
                 // 1. Analyze Divergence (Sender vs Receiver)
@@ -1495,9 +1497,9 @@ export class SyncSagaCoordinator {
                     // }
                 }
 
-                console.log(`${lc} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. outgoingDeltaAddrRequestInfos: ${outgoingDeltaAddrRequestInfos.length}`);
+                if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. outgoingDeltaAddrRequestInfos: ${outgoingDeltaAddrRequestInfos.length}`); }
             } else {
-                console.log(`${lc} [CONFLICT DEBUG] No optimistic conflicts to process`);
+                if (logalot) { console.log(`${lc} [CONFLICT DEBUG] No optimistic conflicts to process`); }
             }
 
             // 2. Prepare Delta Payload (What Receiver Requesting + Our Conflict Logic)
@@ -1608,7 +1610,7 @@ export class SyncSagaCoordinator {
             if (logalot) { console.log(`${lc} deltaData: ${pretty(deltaData)} (I: a76008681df458cfbcdc4848f825a826)`); }
             // #endregion validate/sanity
 
-            console.log(`${lc} [CONFLICT DEBUG] deltaData.payloadAddrs count: ${deltaData.payloadAddrs?.length || 0}`);
+            if (logalot) { console.log(`${lc} [CONFLICT DEBUG] deltaData.payloadAddrs count: ${deltaData.payloadAddrs?.length || 0}`); }
 
             const peerProposesCommit = deltaData.proposeCommit || false;
 
@@ -1618,12 +1620,12 @@ export class SyncSagaCoordinator {
             const receivedPayloadIbGibs: IbGib_V1[] = sagaContext.payloadIbGibsDomain ?? [];
 
             // 2. Fulfill Peer Requests (Outgoing Payload with Delta Dependencies)
-            console.log(`${lc} [CONFLICT DEBUG] Fulfilling ${(deltaData.deltaRequestAddrInfos || []).length} peer requests`);
+            if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Fulfilling ${(deltaData.deltaRequestAddrInfos || []).length} peer requests`); }
             const outgoingPayload = await this.getPayloadsForRequestedInfos({
                 deltaRequestAddrInfos: deltaData.deltaRequestAddrInfos || [],
                 mySpace,
             });
-            console.log(`${lc} [CONFLICT DEBUG] Outgoing payload size (with deps): ${outgoingPayload.length}`);
+            if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Outgoing payload size (with deps): ${outgoingPayload.length}`); }
 
             // 3. Execute Merges (If applicable)
             // Check if we have pending conflicts that we CAN resolve now that we have data.
@@ -1631,15 +1633,15 @@ export class SyncSagaCoordinator {
             // Optimization: Do this only if we received payloads.
             const mergeResultIbGibs: IbGib_V1[] = [];
 
-            console.log(`${lc} [CONFLICT DEBUG] Checking for merge. receivedPayloadIbGibs.length: ${receivedPayloadIbGibs.length}`);
+            if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Checking for merge. receivedPayloadIbGibs.length: ${receivedPayloadIbGibs.length}`); }
 
             if (receivedPayloadIbGibs.length > 0) {
-                console.log(`${lc} [TEST DEBUG] Received Payloads (${receivedPayloadIbGibs.length}). Checking for conflicts/merges...`);
+                if (logalot) { console.log(`${lc} [TEST DEBUG] Received Payloads (${receivedPayloadIbGibs.length}). Checking for conflicts/merges...`); }
                 // Find the Ack frame in history to get conflicts
                 // Optimization: Batch fetch history from `sagaIbGib.rel8ns.past`
                 // V1 timelines carry full history in `past`.
                 const pastAddrs = sagaIbGib.rel8ns?.past || [];
-                console.log(`${lc} [TEST DEBUG] pastAddrs count: ${pastAddrs.length}`);
+                if (logalot) { console.log(`${lc} [TEST DEBUG] pastAddrs count: ${pastAddrs.length}`); }
 
                 const sagaHistory = await getFullSyncSagaHistory({
                     sagaIbGib,
@@ -1679,9 +1681,9 @@ export class SyncSagaCoordinator {
                         // We need `receiverTip` (localAddr in Ack) and `senderTip` (remoteAddr).
 
                         // Check if we have receiverTip in space
-                        console.log(`${lc} [CONFLICT DEBUG] Attempting merge for conflict. ReceiverTip: ${receiverTip}, SenderTip: ${senderTip}`);
+                        if (logalot) { console.log(`${lc} [CONFLICT DEBUG] Attempting merge for conflict. ReceiverTip: ${receiverTip}, SenderTip: ${senderTip}`); }
                         const resRecTip = await getFromSpace({ addr: receiverTip, space: myTempSpace }); // Check myTempSpace for incoming data
-                        console.log(`${lc} [CONFLICT DEBUG] ReceiverTip found in myTempSpace: ${!!resRecTip.ibGibs?.[0]}`);
+                        if (logalot) { console.log(`${lc} [CONFLICT DEBUG] ReceiverTip found in myTempSpace: ${!!resRecTip.ibGibs?.[0]}`); }
                         if (resRecTip.success && resRecTip.ibGibs?.[0]) {
                             // We have the tip!
                             // Do we have the full history?
@@ -1697,13 +1699,13 @@ export class SyncSagaCoordinator {
                                     metaspace,
                                 });
                                 if (mergeResult) {
-                                    console.log(`${lc} [TEST DEBUG] Merge success! New Tip: ${getIbGibAddr({ ibGib: mergeResult })}`);
+                                    if (logalot) { console.log(`${lc} [TEST DEBUG] Merge success! New Tip: ${getIbGibAddr({ ibGib: mergeResult })}`); }
                                     if (logalot) { console.log(`${lc} Merge success! New Tip: ${getIbGibAddr({ ibGib: mergeResult })}`); }
                                     mergeResultIbGibs.push(mergeResult);
                                     outgoingPayload.push(mergeResult); // Send result to peer
                                 }
                             } catch (e) {
-                                console.error(`${lc} Merge failed: ${e}`);
+                                console.error(`${lc} (NOT THROWN) Merge failed: ${e} (E: 491b464fc6f4857f52ff3df213105826)`);
                                 // If merge fails, we might Abort or just continue?
                             }
                         }
@@ -1864,11 +1866,13 @@ export class SyncSagaCoordinator {
      */
     private async executeLocalCommit({
         deltaFrame,
+        commitFrame,
         sagaHistory,
         metaspace, localSpace, localTempSpace,
         identity,
     }: {
-        deltaFrame: SyncIbGib_V1;
+        deltaFrame?: SyncIbGib_V1;
+        commitFrame?: SyncIbGib_V1;
         sagaHistory: SyncSagaFrameDependencyGraph[];
         metaspace: MetaspaceService;
         localSpace: IbGibSpaceAny;
@@ -1878,9 +1882,39 @@ export class SyncSagaCoordinator {
         const lc = `${this.lc}[${this.executeLocalCommit.name}]`;
         try {
             if (logalot) { console.log(`${lc} starting... (I: 6734980446b86a63c1af6e2e206de826)`); }
+            if (!deltaFrame && !commitFrame) {
+                throw new Error(`(UNEXPECTED) !deltaFrame && !commitFrame? we're expecting to execute the commit based off of EITHER a delta OR a commit frame. (E: 10cae319a2685a672866f5583514e326)`);
+            } else if (deltaFrame && commitFrame) {
+                throw new Error(`(UNEXPECTED) deltaFrame && commitFrame? we're expecting to execute the commit based off of EITHER a delta OR a commit frame. (E: b9037b1ed6d8684ac8a5d01328bad826)`);
+            }
+
+            /**
+             * Sync has a two-stage commit. The first is from a delta frame with
+             * `proposeCommit: true`. That produces a commit frame, which on the
+             * other end triggers the second leg.
+             */
+            const isFirstCommitLeg = !!deltaFrame;
+            const currentFrame = isFirstCommitLeg ? deltaFrame : commitFrame;
+            if (!currentFrame) { throw new Error(`(UNEXPECTED) !currentFrame? something wrong with my logic. (E: 4ec0ce6625cc1d677bc902c839ca1a26)`); }
+
+            /**
+             * we only want to register new ibgibs from the other end, so we
+             * will compare the history payloads/push offers with the context
+             * that provided those payloads.
+             *
+             * So we will filter out the history that we produced, which should
+             * leave us only with externally created payload addrs.
+             *
+             *  NOTE: I have this at the beginning of the function PURELY to get
+             *  a log value in to understand the context of this function's
+             *  output.
+             */
+            const currentFrameOrigin = getSyncSagaFrameOrigin({ sagaFrame: currentFrame });
+
+            if (logalot) { console.log(`${lc} currentFrameOrigin: ${currentFrameOrigin} (I: 3add8f8390c89743ae554bd3cc60b826)`); }
 
             // #region validate/sanity
-            if (!deltaFrame.data) { throw new Error(`(UNEXPECTED) deltaFrame.data falsy? (E: a8be68d48668d93d992d793834823826)`); }
+            if (!currentFrame.data) { throw new Error(`(UNEXPECTED) currentFrame.data falsy? (E: a8be68d48668d93d992d793834823826)`); }
             // #endregion validate/sanity
 
             // * move all payload addrs from temp space to local space
@@ -1894,8 +1928,12 @@ export class SyncSagaCoordinator {
                 }
             }
 
-            sagaHistory.forEach(x => {
+            sagaHistory.filter(x => {
+                const frameExecutionContext = getSyncSagaFrameOrigin({ sagaFrame: x.sagaIbGib });
+                return currentFrameOrigin === frameExecutionContext;
+            }).forEach(x => {
                 if (!x.sagaIbGib.data) { throw new Error(`(UNEXPECTED) sagaIbGib.data falsy? (E: 34d7f8cdee14717ce828878d98f89826)`); }
+                if (logalot) { console.log(`${lc}[${currentFrameOrigin}] history slice: ${pretty(x)} (I: e5a9436fb66b0df3183bd6d81be2ca26)`); }
                 x.msgStones.forEach(msgStone => {
                     if (!msgStone.data) { throw new Error(`(UNEXPECTED) msgStone.data falsy? (E: 21406101f91847514cc759c8a7382f26)`); }
                     if (msgStone.data.stage === SyncStage.ack) {
@@ -1914,70 +1952,90 @@ export class SyncSagaCoordinator {
                 })
             });
 
+            if (logalot) { console.log(`${lc}[${currentFrameOrigin}] allPayloadAddrsDomainTransferred: ${allPayloadAddrsDomainTransferred.length > 0 ? allPayloadAddrsDomainTransferred.join(', ') : 'none'} (I: a1950eb3ca95bdc9ec18a4b8823e9826)`); }
+
             // at this point, we have a list of ALL payload addrs retrieved.
             let allPayloadIbGibsDomainTransferred: IbGib_V1[] = [];
-            const resGetAllTransferred =
-                await getFromSpace({ addrs: allPayloadAddrsDomainTransferred, space: localTempSpace });
-            if (resGetAllTransferred.success && resGetAllTransferred.ibGibs && resGetAllTransferred.ibGibs.length === allPayloadAddrsDomainTransferred.length) {
-                allPayloadIbGibsDomainTransferred = resGetAllTransferred.ibGibs.concat();
-            } else {
-                // errored out, gather info
-                if (!resGetAllTransferred.rawResultIbGib) { throw new Error(`(UNEXPECTED) !resGetAllTransferred.rawResultIbGib falsy? (E: dc6cf8729668f4fbe8c024f887d97a26)`); }
-                const { addrsNotFound, addrsErrored, errors } = resGetAllTransferred.rawResultIbGib.data as IbGibSpaceResultData;
-                throw new Error(`(UNEXPECTED) we couldn't get all addrs transferred throughout the saga from the tempspace (${localTempSpace.ib})? addrsNotFound: ${addrsNotFound ?? []}. addrsErrored: ${addrsErrored ?? []}. errors: ${errors ?? []}(E: 222e341e634862b4d88ae7282584d826)`);
+            if (allPayloadAddrsDomainTransferred.length > 0) {
+                const resGetAllTransferred =
+                    await getFromSpace({ addrs: allPayloadAddrsDomainTransferred, space: localTempSpace });
+                if (resGetAllTransferred.success && resGetAllTransferred.ibGibs && resGetAllTransferred.ibGibs.length === allPayloadAddrsDomainTransferred.length) {
+                    allPayloadIbGibsDomainTransferred = resGetAllTransferred.ibGibs.concat();
+                } else {
+                    // errored out, gather info
+                    if (!resGetAllTransferred.rawResultIbGib) { throw new Error(`(UNEXPECTED) !resGetAllTransferred.rawResultIbGib falsy? (E: dc6cf8729668f4fbe8c024f887d97a26)`); }
+                    const { addrsNotFound, addrsErrored, errors } = resGetAllTransferred.rawResultIbGib.data as IbGibSpaceResultData;
+                    throw new Error(`(UNEXPECTED) we couldn't get all addrs transferred throughout the saga from the tempspace (${localTempSpace.ib})? addrsNotFound: ${addrsNotFound ?? []}. addrsErrored: ${addrsErrored ?? []}. errors: ${errors ?? []}(E: 222e341e634862b4d88ae7282584d826)`);
+                }
             }
 
             // now we have all ibgibs transferred, first put them all the local space
+            if (allPayloadIbGibsDomainTransferred.length === 0) {
+                // nothing was synced
+                if (logalot) { console.log(`${lc}[${currentFrameOrigin}] no changes on this end (I: fa30d18e83a87ee9e8487fbb5d632b26)`); }
+            } else {
+                if (logalot) { console.log(`${lc}[${currentFrameOrigin}] ${allPayloadIbGibsDomainTransferred.length} changes detected (I: fa30d18e83a87ee9e8487fbb5d632b26)`); }
 
-            const { payload_Dnas, payload_NonDnas } =
-                await putInSpace_dnasThenNonDnas({
-                    ibGibs: allPayloadIbGibsDomainTransferred,
-                    space: localSpace
-                });
-
-            const { mapWithTjp_NoDna, mapWithTjp_YesDna, mapWithoutTjps } =
-                splitPerTjpAndOrDna({ ibGibs: payload_NonDnas, filterPrimitives: true });
-
-            // first register all non-tjp stones
-            const nontjps = Object.values(mapWithoutTjps);
-            for (const nontjp of nontjps) {
-                await metaspace.registerNewIbGib({
-                    ibGib: nontjp,
-                    space: localSpace,
-                });
-            }
+                if (logalot) { console.log(`${lc} put all into localSpace (${localSpace.ib}) starting... (I: d5e0d9870e380b61e80c729660058826)`); }
+                const { payload_Dnas, payload_NonDnas } =
+                    await putInSpace_dnasThenNonDnas({
+                        ibGibs: allPayloadIbGibsDomainTransferred,
+                        space: localSpace
+                    });
+                if (logalot) { console.log(`${lc} put all into localSpace (${localSpace.ib}) complete. (I: d5e0d9870e380b61e80c729660058826)`); }
 
-            // next register each timeline in order...
+                const { mapWithTjp_NoDna, mapWithTjp_YesDna, mapWithoutTjps } =
+                    splitPerTjpAndOrDna({ ibGibs: payload_NonDnas, filterPrimitives: true });
 
-            // ...first the ones without dna...
-            const timelinesByTjpAddr_NoDna =
-                getTimelinesGroupedByTjp({ ibGibs: Object.values(mapWithTjp_NoDna) });
-            const tjpAddrs_NoDna = Object.keys(timelinesByTjpAddr_NoDna);
-            for (const tjpAddr_NoDna of tjpAddrs_NoDna) {
-                const timelineIbGibs = timelinesByTjpAddr_NoDna[tjpAddr_NoDna];
-                for (const ibGib of timelineIbGibs) {
+                // first register all non-tjp stones
+                if (logalot) { console.log(`${lc} register mapWithoutTjps starting... (I: 2b84d8f8dda85adde88696d8419bf726)`); }
+                const nontjps = Object.values(mapWithoutTjps);
+                for (const nontjp of nontjps) {
+                    if (logalot) { console.log(`${lc} registering ${getIbGibAddr({ ibGib: nontjp })} (I: 4647b4f42d27cffe0fbfce8846755826)`); }
                     await metaspace.registerNewIbGib({
-                        ibGib,
+                        ibGib: nontjp,
                         space: localSpace,
                     });
                 }
-            }
-
-            // ...then the ones WITH dna.
-            const timelinesByTjpAddr_YesDna =
-                getTimelinesGroupedByTjp({ ibGibs: Object.values(mapWithTjp_YesDna) });
-            const tjpAddrs_YesDna = Object.keys(timelinesByTjpAddr_YesDna);
-            for (const tjpAddr_YesDna of tjpAddrs_YesDna) {
-                const timelineIbGibs = timelinesByTjpAddr_YesDna[tjpAddr_YesDna];
-                for (const ibGib of timelineIbGibs) {
-                    await metaspace.registerNewIbGib({
-                        ibGib,
-                        space: localSpace,
-                    });
+                if (logalot) { console.log(`${lc} mapWithoutTjps complete. (I: 2b84d8f8dda85adde88696d8419bf726)`); }
+
+                // next register each timeline in order...
+
+                // ...first the ones without dna...
+                if (logalot) { console.log(`${lc} register mapWithTjp_NoDna starting... (I: 96e648e4db382499b8bfaa1b37c24826)`); }
+                const timelinesByTjpAddr_NoDna =
+                    getTimelinesGroupedByTjp({ ibGibs: Object.values(mapWithTjp_NoDna) });
+                const tjpAddrs_NoDna = Object.keys(timelinesByTjpAddr_NoDna);
+                for (const tjpAddr_NoDna of tjpAddrs_NoDna) {
+                    const timelineIbGibs = timelinesByTjpAddr_NoDna[tjpAddr_NoDna];
+                    for (const ibGib of timelineIbGibs) {
+                        await metaspace.registerNewIbGib({
+                            ibGib,
+                            space: localSpace,
+                        });
+                    }
                 }
+                if (logalot) { console.log(`${lc} register mapWithTjp_NoDna complete. (I: 96e648e4db382499b8bfaa1b37c24826)`); }
+
+                // ...then the ones WITH dna.
+                if (logalot) { console.log(`${lc} register mapWithTjp_YesDna starting... (I: d54a820e9442dee4681f6228a6795926)`); }
+                const timelinesByTjpAddr_YesDna =
+                    getTimelinesGroupedByTjp({ ibGibs: Object.values(mapWithTjp_YesDna) });
+                const tjpAddrs_YesDna = Object.keys(timelinesByTjpAddr_YesDna);
+                for (const tjpAddr_YesDna of tjpAddrs_YesDna) {
+                    const timelineIbGibs = timelinesByTjpAddr_YesDna[tjpAddr_YesDna];
+                    for (const ibGib of timelineIbGibs) {
+                        await metaspace.registerNewIbGib({
+                            ibGib,
+                            space: localSpace,
+                        });
+                    }
+                }
+                if (logalot) { console.log(`${lc} register mapWithTjp_YesDna complete. (I: d54a820e9442dee4681f6228a6795926)`); }
             }
 
 
+
         } catch (error) {
             console.error(`${lc} ${extractErrorMsg(error)}`);
             throw error;
@@ -2059,49 +2117,55 @@ export class SyncSagaCoordinator {
         try {
             if (logalot) { console.log(`${lc} starting... (I: e179573bdd881202f8ba3168da1c3826)`); }
 
-            let resNextSagaFrameInfo: NextSagaFrameInfo;
+            if (!sagaIbGib.data) { throw new Error(`(UNEXPECTED) sagaIbGib.data falsy? (E: cbc31dbb7d28b5b8c8cddb510d7d2826)`); }
 
-            // Sender Logic (Finalizing):
-            // If we are here, we received a Commit frame from the Peer.
-            // This implies the Peer has successfully committed.
-            // We should now:
-            // 1. Validate (implicitly done by receiving valid frame)
-            // 2. Perform our own cleanup (Temp -> Dest, if applicable)
-            // 3. Return saga completion.
-
-            // one last validate entire history?
-            const history = await getFullSyncSagaHistory({
-                sagaIbGib,
-                space: mySpace,
-            });
-            const validationErrors = await validateFullSyncSagaHistory({
-                history,
-            });
-            if (validationErrors.length > 0) {
-                const errorCommitFrame = await this.createCommitFrame({
+            if (sagaIbGib.data.errors && sagaIbGib.data.errors.length > 0) {
+                // our saga errored out but we already committed the darn
+                // changes previously
+                throw new Error(`not implemented...saga errored out on other end but we've already committed our changes. we need to implement undoing our changes, i.e., rollback commit, which basically is deleting all the payloads that we already put in in our previous commit. (E: e8eb789e0c08f0b3cf93607cb73e9f26)`);
+            } else {
+                // Sender Logic (Finalizing):
+                // If we are here, we received a Commit frame from the Peer.
+                // This implies the Peer has successfully committed.
+                // We should now:
+                // 1. Validate (implicitly done by receiving valid frame)
+                // 2. Perform our own cleanup (Temp -> Dest, if applicable)
+                // 3. Return saga completion.
+
+                // one last validate entire history ?
+                const history = await getFullSyncSagaHistory({
                     sagaIbGib,
-                    metaspace,
-                    mySpace,
-                    identity,
-                    errors: validationErrors,
+                    space: mySpace,
                 });
-                return { frame: errorCommitFrame, }; /* <<<< returns early */
-            }
+                const validationErrors = await validateFullSyncSagaHistory({
+                    history,
+                });
+                if (validationErrors.length > 0) {
+                    const errorCommitFrame = await this.createCommitFrame({
+                        sagaIbGib,
+                        metaspace,
+                        mySpace,
+                        identity,
+                        errors: validationErrors,
+                    });
+                    return { frame: errorCommitFrame, }; /* <<<< returns early */
+                }
 
-            await this.executeLocalCommit({
-                deltaFrame: sagaIbGib,
-                sagaHistory: history,
-                localSpace: mySpace,
-                localTempSpace: myTempSpace,
-                metaspace,
-            });
+                await this.executeLocalCommit({
+                    commitFrame: sagaIbGib,
+                    sagaHistory: history,
+                    localSpace: mySpace,
+                    localTempSpace: myTempSpace,
+                    metaspace,
+                });
 
-            // 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.`); }
+                // 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.`); }
 
-            // the holy grail!
-            return { sagaComplete: true };
+                // the holy grail!
+                return { sagaComplete: true };
+            }
         } catch (error) {
             const emsg = `${lc} ${extractErrorMsg(error)}`;
             console.error(emsg);

package/src/sync/sync-types.mts

@@ -54,40 +54,34 @@ export function isValidSyncConflictStrategy(strategy: string): strategy is SyncC
 }
 // #endregion SyncConflictStrategy
 
-// #region SyncExecutionContext
-export const SYNC_EXECUTION_CONTEXT_SENDER = 'sender';
-export const SYNC_EXECUTION_CONTEXT_RECEIVER = 'receiver';
-export type SyncExecutionContext =
-    | typeof SYNC_EXECUTION_CONTEXT_SENDER
-    | typeof SYNC_EXECUTION_CONTEXT_RECEIVER
+// #region SyncSagaFrameOrigin
+export const SYNC_SAGA_FRAME_ORIGIN_SENDER = 'sender';
+export const SYNC_SAGA_FRAME_ORIGIN_RECEIVER = 'receiver';
+export type SyncSagaFrameOrigin =
+    | typeof SYNC_SAGA_FRAME_ORIGIN_SENDER
+    | typeof SYNC_SAGA_FRAME_ORIGIN_RECEIVER
     ;
 /**
- * if the current code execution is executing on the original sender (the
- * initiator of the sync saga operation) or the other party, the "receiver" (the
- * one responding).
+ * if the frame was created by the original sender (the initiator of the sync
+ * saga operation) or the other party, the "receiver" (the one responding).
  *
  * This is driven by looking at the latest value of `sagaFrame.data.n` value.
- *
- * NOTE: This is not to be confused with the sync saga context ibgib, which is
- * something else entirely. That is the transport wrapper ibgib around the saga.
- * this is strictly the enum for where the code is executing.
  */
-export const SyncExecutionContext = {
+export const SyncSagaFrameOrigin = {
     /**
-     * The current code is executing on the initial location that started the
-     * sync.
+     * The frame was created on the initial location that started the sync.
      */
-    sender: SYNC_EXECUTION_CONTEXT_SENDER,
+    sender: SYNC_SAGA_FRAME_ORIGIN_SENDER,
     /**
-     * The current code is executing on the receiving end, which is either a
-     * physically different location or is the logical "receiver" of an
-     * in-memory sync execution.
+     * The frame was created on the receiving end, which is either a physically
+     * different location or is the logical "receiver" of an in-memory sync
+     * execution.
      */
-    receiver: SYNC_EXECUTION_CONTEXT_RECEIVER,
-} satisfies { [key in SyncExecutionContext]: SyncExecutionContext };
-export const SYNC_EXECUTION_CONTEXT_VALID_VALUES = Object.values(SyncExecutionContext);
-export function isValidSyncExecutionContext(executionContext: string): executionContext is SyncExecutionContext {
-    return SYNC_EXECUTION_CONTEXT_VALID_VALUES.includes(executionContext as SyncExecutionContext);
+    receiver: SYNC_SAGA_FRAME_ORIGIN_RECEIVER,
+} satisfies { [key in SyncSagaFrameOrigin]: SyncSagaFrameOrigin };
+export const SYNC_SAGA_FRAME_ORIGIN_VALID_VALUES = Object.values(SyncSagaFrameOrigin);
+export function isValidSyncSagaFrameOrigin(sagaFrameOrigin: string): sagaFrameOrigin is SyncSagaFrameOrigin {
+    return SYNC_SAGA_FRAME_ORIGIN_VALID_VALUES.includes(sagaFrameOrigin as SyncSagaFrameOrigin);
 }
 // #endregion SyncConflictStrategy
 
@@ -113,7 +107,6 @@ export interface NextSagaFrameInfo_SagaComplete {
 export type NextSagaFrameInfo =
     NextSagaFrameInfo_Frame | NextSagaFrameInfo_SagaComplete;
 
-
 export interface HandleSagaResponseContextResult_Base {
     /**
      * if truthy, handling saga context failed, else it succeeded.