@ibgib/core-gib 0.1.59 → 0.1.61

package/dist/sync/sync-saga-coordinator.mjs

@@ -8,7 +8,7 @@ import { putInSpace, getLatestAddrs, getFromSpace, registerNewIbGib } from "../w
 import { SyncStage, SYNC_ATOM, SYNC_MSG_REL8N_NAME, SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN, SyncConflictStrategy, SYNC_CONFLICT_STRATEGY_VALID_VALUES, } from "./sync-constants.mjs";
 import { appendToTimeline, createTimeline, getHistory, getHistoryAddrs } from "../timeline/timeline-api.mjs";
 import { SyncMode, } from "./sync-types.mjs";
-import { getSyncSagaFrameOrigin, getFullSyncSagaHistory, getSyncIb, getTempSpaceName, isPastFrame, putInSpace_dnasThenNonDnas, validateFullSyncSagaHistory, getAllOrphanedAddresses, getFinalConflictsInfo } from "./sync-helpers.mjs";
+import { getSyncSagaFrameOrigin, getFullSyncSagaHistory, getSyncIb, getTempSpaceName, isPastFrame, putInSpace_dnasThenNonDnas, validateFullSyncSagaHistory, getAllOrphanedAddresses, getFinalConflictsInfo, getSyncSagaFrameDependencyGraph } from "./sync-helpers.mjs";
 import { getDeltaDependencyGraph, getDependencyGraph } from "../common/other/graph-helper.mjs";
 import { getSyncSagaMessageIb } from "./sync-saga-message/sync-saga-message-helpers.mjs";
 import { SYNC_SAGA_MSG_ATOM } from "./sync-saga-message/sync-saga-message-constants.mjs";
@@ -324,141 +324,155 @@ export class SyncSagaCoordinator {
                 },
             }));
             // #endregion set up peer observable for any domainPayloadsMap
-            // ...create/compose the Request Context itself...
-            const requestCtx = await this.createSyncSagaContext({
-                sagaFrame: currentFrame,
-                /**
-                 * init frame: empty
-                 * ack frame: possible push offers
-                 * delta frame: requested ibgibs or commit offer
-                 * commit frame: empty
-                 */
-                payloadIbGibsDomain: nextDomainIbGibs,
-                localSpace,
-                metaspace,
-                sessionIdentityAddr: peer.currentSessionIdentityAddr,
-                peer,
-            });
-            // #region Log what we're sending
-            if (logalotControlDomain) {
-                const domainAddrs = nextDomainIbGibs.map(p => getIbGibAddr({ ibGib: p }));
-                console.log(`${lc}${lcControlDomain} SENDER TRANSMIT -> peer.witness (I: 5b0081803698770f0bf64992220b312)`);
-                console.log(`${lc}${lcControlDomain}   Context: ${getIbGibAddr({ ibGib: requestCtx })}`);
-                console.log(`${lc}${lcControlDomain}   Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
-                console.log(`${lc}${lcControlDomain}   DOMAIN Payloads (${domainAddrs.length}): ${domainAddrs.join(', ') || '(none)'}`);
-            }
-            // #endregion Log what we're sending
-            // update our saga listeners...
-            // if (logalot) { console.log(`${lc} transmitting... requestCtx: ${pretty(requestCtx)} (I: 8cf20817c66899abdb1e76df50356826)`); }
-            updates$.next(requestCtx); // spins off for saga UI updates
-            // ...And send the context.
-            peer.setOptionalOpts({ localSpace, localTempSpace: tempSpace, });
-            const responseCtx = await peer.witness(requestCtx);
-            // the send returned, but a peer can return a falsy responseCtx, if
-            // we just sent a commit to them and they're done. If so, there will
-            // necessarily be no payload to wait to receive
-            if (!responseCtx) {
-                if (currentFrame) {
-                    // Check for Commit (Peer silence expected)
-                    const msg = await getSyncSagaMessageFromFrame({ frameIbGib: currentFrame, space: localSpace });
-                    if (msg?.data?.stage === SyncStage.commit) {
-                        if (logalot) {
-                            console.log(`${lc} Sender sent Commit. Peer returned no response. Saga Complete. (I: 26f9ee073858ca78b8284753368b5226)`);
+            try {
+                // ...create/compose the Request Context itself...
+                const requestCtx = await this.createSyncSagaContext({
+                    sagaFrame: currentFrame,
+                    /**
+                     * init frame: empty
+                     * ack frame: possible push offers
+                     * delta frame: requested ibgibs or commit offer
+                     * commit frame: empty
+                     */
+                    payloadIbGibsDomain: nextDomainIbGibs,
+                    localSpace,
+                    metaspace,
+                    sessionIdentityAddr: peer.currentSessionIdentityAddr,
+                    peer,
+                });
+                // #region Log what we're sending
+                if (logalotControlDomain) {
+                    const domainAddrs = nextDomainIbGibs.map(p => getIbGibAddr({ ibGib: p }));
+                    console.log(`${lc}${lcControlDomain} SENDER TRANSMIT -> peer.witness (I: 5b0081803698770f0bf64992220b312)`);
+                    console.log(`${lc}${lcControlDomain}   Context: ${getIbGibAddr({ ibGib: requestCtx })}`);
+                    console.log(`${lc}${lcControlDomain}   Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
+                    console.log(`${lc}${lcControlDomain}   DOMAIN Payloads (${domainAddrs.length}): ${domainAddrs.join(', ') || '(none)'}`);
+                }
+                // #endregion Log what we're sending
+                // update our saga listeners...
+                // if (logalot) { console.log(`${lc} transmitting... requestCtx: ${pretty(requestCtx)} (I: 8cf20817c66899abdb1e76df50356826)`); }
+                updates$.next(requestCtx); // spins off for saga UI updates
+                // ...And send the context.
+                peer.setOptionalOpts({ localSpace, localTempSpace: tempSpace, });
+                const responseCtx = await peer.witness(requestCtx);
+                // the send returned, but a peer can return a falsy responseCtx, if
+                // we just sent a commit to them and they're done. If so, there will
+                // necessarily be no payload to wait to receive
+                if (!responseCtx) {
+                    if (currentFrame) {
+                        // Check for Commit (Peer silence expected)
+                        const msg = await getSyncSagaMessageFromFrame({ frameIbGib: currentFrame, space: localSpace });
+                        if (msg?.data?.stage === SyncStage.commit) {
+                            if (logalot) {
+                                console.log(`${lc} Sender sent Commit. Peer returned no response. Saga Complete. (I: 26f9ee073858ca78b8284753368b5226)`);
+                            }
+                            currentFrame = null;
+                            break;
+                        }
+                        else {
+                            throw new Error(`(UNEXPECTED) responseCtx falsy and currentFrame truthy, but we're not in the commit stage? This may be expected ultimately, but atow I am not seeing this as being expected. (E: cc34498962bd370deeff351fac939f26)`);
                         }
-                        currentFrame = null;
-                        break;
                     }
                     else {
-                        throw new Error(`(UNEXPECTED) responseCtx falsy and currentFrame truthy, but we're not in the commit stage? This may be expected ultimately, but atow I am not seeing this as being expected. (E: cc34498962bd370deeff351fac939f26)`);
+                        throw new Error(`(UNEXPECTED) no response and currentFrame falsy? (E: 8d1085ea2f28cfc3f9c922649864a826)`);
                     }
                 }
-                else {
-                    throw new Error(`(UNEXPECTED) no response and currentFrame falsy? (E: 8d1085ea2f28cfc3f9c922649864a826)`);
-                }
-            }
-            // at this point, we did indeed receive a response to analyze. BUT!
-            // we have only necessarily received the response context ibgib.
-            // if there were payloads expected to be transferred, they may not
-            // be done yet.
-            if (!responseCtx.data) {
-                throw new Error(`(UNEXPECTED) responseCtx.data falsy? (E: a969992bae53ab18a827ec58aec15826)`);
-            }
-            updates$.next(responseCtx); // spins off for saga UI updating
-            // immediately validate context/saga frame (but not payloads because
-            // we may not have those yet)
-            const contextAndSagaFrameValidationErrors = await validateContextAndSagaFrame({ context: responseCtx });
-            if (contextAndSagaFrameValidationErrors.length > 0) {
-                throw new Error(`contextAndSagaFrameValidationErrors: ${contextAndSagaFrameValidationErrors} (E: 6eebe8e7fa437c00a8cde3ada3c66826)`);
-            }
-            // Extract expected domain addresses from response context
-            const responsePayloadAddrsDomain = responseCtx.data[SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN] || [];
-            // Poll for them if needed. see above jsdocs for domainPayloadsMap
-            if (responsePayloadAddrsDomain.length > 0) {
-                responseCtx.payloadIbGibsDomain = await this.pollForDomainPayloads({
-                    expectedAddrs: responsePayloadAddrsDomain,
-                    pollIntervalMs: 20, // relatively arbitrary right now
-                    domainPayloadsMap,
-                    tempSpace,
+                // at this point, we did indeed receive a response to analyze. BUT!
+                // we have only necessarily received the response context ibgib.
+                // if there were payloads expected to be transferred, they may not
+                // be done yet.
+                if (!responseCtx.data) {
+                    throw new Error(`(UNEXPECTED) responseCtx.data falsy? (E: a969992bae53ab18a827ec58aec15826)`);
+                }
+                updates$.next(responseCtx); // spins off for saga UI updating
+                // immediately validate context/saga frame (but not payloads because
+                // we may not have those yet)
+                const contextAndSagaFrameValidationErrors = await validateContextAndSagaFrame({ context: responseCtx });
+                if (contextAndSagaFrameValidationErrors.length > 0) {
+                    throw new Error(`contextAndSagaFrameValidationErrors: ${contextAndSagaFrameValidationErrors} (E: 6eebe8e7fa437c00a8cde3ada3c66826)`);
+                }
+                // Turn-by-turn continuation & identity checks
+                const returnContextErrors = await this.validateReturnContext({
+                    requestCtx,
+                    responseCtx,
+                    localSpace,
                 });
-            }
-            // #region Log what we received back
-            if (!responseCtx.sagaFrame) {
-                throw new Error(`(UNEXPECTED) responseCtx.sagaFrame falsy? the Peer should have set this when it got the response back from the remote. (E: e650adadf9a2063ec6764a1e31d3d826)`);
-            }
-            if (logalotControlDomain) {
-                const responseControlAddrs = responseCtx.data?.['@payloadAddrsControl'] || [];
-                console.log(`${lc}${lcControlDomain} SENDER RECEIVED <- peer.witness (I: 3dc76a9744d89a4fc3e2f076c2be4826)`);
-                console.log(`${lc}${lcControlDomain}   Response Context: ${getIbGibAddr({ ibGib: responseCtx })}`);
-                console.log(`${lc}${lcControlDomain}   Response Saga Frame: ${getIbGibAddr({ ibGib: responseCtx.sagaFrame })}`);
-                console.log(`${lc}${lcControlDomain}   CONTROL Payloads (${responseControlAddrs.length}): ${responseControlAddrs.join(', ') || '(none)'}`);
-                console.log(`${lc}${lcControlDomain}   DOMAIN Payloads (${responsePayloadAddrsDomain.length}): ${responsePayloadAddrsDomain.join(', ') || '(none)'}`);
-            }
-            // #endregion Log what we received back
-            // at this point, we have received the context AND **all** of the
-            // domain payloads (if applicable), so we are ready to do the next
-            // iteration in the saga loop
-            // this is the part that drives the FSM forward, i.e., when we
-            // evolve the sync saga ibgib itself to the next frame if we aren't
-            // finished/errored out.
-            const contextResult = await this.handleResponseSagaContext({
-                sagaContext: responseCtx,
-                initDomainGraph,
-                mySpace: localSpace,
-                myTempSpace: tempSpace,
-                metaspace,
-            });
-            if (!contextResult) {
-                // 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)`);
+                if (returnContextErrors.length > 0) {
+                    throw new Error(`validateReturnContext errors: ${returnContextErrors.join(', ')} (E: cb8a023b9d0728cceb09fa3da0bb8226)`);
+                }
+                // Extract expected domain addresses from response context
+                const responsePayloadAddrsDomain = responseCtx.data[SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN] || [];
+                // Poll for them if needed. see above jsdocs for domainPayloadsMap
+                if (responsePayloadAddrsDomain.length > 0) {
+                    responseCtx.payloadIbGibsDomain = await this.pollForDomainPayloads({
+                        expectedAddrs: responsePayloadAddrsDomain,
+                        pollIntervalMs: 20, // relatively arbitrary right now
+                        domainPayloadsMap,
+                        tempSpace,
+                    });
                 }
-                break;
-            }
-            // #region error conditions throw
-            if (contextResult.errorMsg) {
-                throw new Error(`Couldn't handle response saga context. errorMsg: ${contextResult.errorMsg} (E: c948e81d513b2a0eb8b8afa878edc626)`);
+                // #region Log what we received back
+                if (!responseCtx.sagaFrame) {
+                    throw new Error(`(UNEXPECTED) responseCtx.sagaFrame falsy? the Peer should have set this when it got the response back from the remote. (E: e650adadf9a2063ec6764a1e31d3d826)`);
+                }
+                if (logalotControlDomain) {
+                    const responseControlAddrs = responseCtx.data?.['@payloadAddrsControl'] || [];
+                    console.log(`${lc}${lcControlDomain} SENDER RECEIVED <- peer.witness (I: 3dc76a9744d89a4fc3e2f076c2be4826)`);
+                    console.log(`${lc}${lcControlDomain}   Response Context: ${getIbGibAddr({ ibGib: responseCtx })}`);
+                    console.log(`${lc}${lcControlDomain}   Response Saga Frame: ${getIbGibAddr({ ibGib: responseCtx.sagaFrame })}`);
+                    console.log(`${lc}${lcControlDomain}   CONTROL Payloads (${responseControlAddrs.length}): ${responseControlAddrs.join(', ') || '(none)'}`);
+                    console.log(`${lc}${lcControlDomain}   DOMAIN Payloads (${responsePayloadAddrsDomain.length}): ${responsePayloadAddrsDomain.join(', ') || '(none)'}`);
+                }
+                // #endregion Log what we received back
+                // at this point, we have received the context AND **all** of the
+                // domain payloads (if applicable), so we are ready to do the next
+                // iteration in the saga loop
+                // this is the part that drives the FSM forward, i.e., when we
+                // evolve the sync saga ibgib itself to the next frame if we aren't
+                // finished/errored out.
+                const contextResult = await this.handleResponseSagaContext({
+                    sagaContext: responseCtx,
+                    initDomainGraph,
+                    mySpace: localSpace,
+                    myTempSpace: tempSpace,
+                    metaspace,
+                });
+                if (!contextResult) {
+                    // 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;
+                }
+                // #region error conditions throw
+                if (contextResult.errorMsg) {
+                    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)`);
+                }
+                // #endregion error conditions throw
+                // we have another frame to process and send out, with possibly
+                // payload domain ibgibs as well
+                const { frame, payloadIbGibsDomain, } = contextResult.nextFrameInfo;
+                currentFrame = frame;
+                nextDomainIbGibs = [...(payloadIbGibsDomain || [])];
+                // #region Log handler output for next iteration
+                if (logalotControlDomain) {
+                    const handlerDomainAddrs = nextDomainIbGibs.map(p => getIbGibAddr({ ibGib: p }));
+                    console.log(`${lc}${lcControlDomain} HANDLER RESULT -> next iteration (I: 6b0d88c4c28857ccd812381515bd7826)`);
+                    console.log(`${lc}${lcControlDomain}   Next Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
+                    console.log(`${lc}${lcControlDomain}   DOMAIN for next (${handlerDomainAddrs.length}): ${handlerDomainAddrs.join(', ') || '(none)'}`);
+                }
+                // #endregion Log handler output for next iteration
             }
-            else if (!contextResult.nextFrameInfo) {
-                throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo falsy? (E: c287a82e823e662a77923278e2418826)`);
+            finally {
+                await subscription.unsubscribe();
             }
-            // #endregion error conditions throw
-            // we have another frame to process and send out, with possibly
-            // payload domain ibgibs as well
-            const { frame, payloadIbGibsDomain, } = contextResult.nextFrameInfo;
-            currentFrame = frame;
-            nextDomainIbGibs = [...(payloadIbGibsDomain || [])];
-            // #region Log handler output for next iteration
-            if (logalotControlDomain) {
-                const handlerDomainAddrs = nextDomainIbGibs.map(p => getIbGibAddr({ ibGib: p }));
-                console.log(`${lc}${lcControlDomain} HANDLER RESULT -> next iteration (I: 6b0d88c4c28857ccd812381515bd7826)`);
-                console.log(`${lc}${lcControlDomain}   Next Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
-                console.log(`${lc}${lcControlDomain}   DOMAIN for next (${handlerDomainAddrs.length}): ${handlerDomainAddrs.join(', ') || '(none)'}`);
-            }
-            // #endregion Log handler output for next iteration
         }
     }
     /**
@@ -544,6 +558,14 @@ export class SyncSagaCoordinator {
             });
             // Attach actual ibgibs for transport
             contextIbGib.sagaFrame = sagaFrame;
+            const { msgStones } = await getSyncSagaFrameDependencyGraph({
+                sagaIbGib: sagaFrame,
+                localSpace: localSpace,
+            });
+            if (msgStones.length !== 1) {
+                throw new Error(`(UNEXPECTED) msgStones.length !== 1 inside createSyncSagaContext? (E: a98165cf46ab4e82b7bd5e45a273b826)`);
+            }
+            contextIbGib.sagaFrameMsg = msgStones[0];
             if (payloadIbGibsDomain && payloadIbGibsDomain.length > 0) {
                 contextIbGib.payloadIbGibsDomain = payloadIbGibsDomain;
             }
@@ -707,6 +729,45 @@ export class SyncSagaCoordinator {
             }
         }
     }
+    /**
+     * Validates that the return context received from a peer is a valid
+     * continuation of the outbound context and that the session identity
+     * is consistent.
+     */
+    async validateReturnContext({ requestCtx, responseCtx, localSpace, }) {
+        const lc = `${this.lc}[${this.validateReturnContext.name}]`;
+        const errors = [];
+        try {
+            // 1. Verify saga frame continuation
+            if (requestCtx.sagaFrame && responseCtx.sagaFrame) {
+                const requestFrameAddr = getIbGibAddr({ ibGib: requestCtx.sagaFrame });
+                const responseFrameAddr = getIbGibAddr({ ibGib: responseCtx.sagaFrame });
+                const isContinuation = await isPastFrame({
+                    olderAddr: requestFrameAddr,
+                    newerAddr: responseFrameAddr,
+                    space: localSpace,
+                });
+                if (!isContinuation) {
+                    errors.push(`Response saga frame (${responseFrameAddr}) is not a valid continuation of request saga frame (${requestFrameAddr}). (E: 2c85e8d97318ff24ac8a02bd3a068226)`);
+                }
+            }
+            else {
+                errors.push(`Missing sagaFrame on requestCtx or responseCtx. (E: b65c68ff891000ddca8d22384a088226)`);
+            }
+            // 2. Verify session identity has not changed
+            const expectedSessionIdAddr = requestCtx.signedSessionIdentity ?
+                getIbGibAddr({ ibGib: requestCtx.signedSessionIdentity }) :
+                requestCtx.rel8ns?.sessionIdentity?.[0];
+            const responseSessionIdAddr = responseCtx.rel8ns?.sessionIdentity?.[0];
+            if (expectedSessionIdAddr !== responseSessionIdAddr) {
+                errors.push(`Session identity mismatch. Expected ${expectedSessionIdAddr}, got ${responseSessionIdAddr}. (E: ab98716bca88d2243cc822187768226)`);
+            }
+        }
+        catch (error) {
+            errors.push(`Error during validateReturnContext: ${extractErrorMsg(error)} (E: da878e1239aa88ee27bdfca005c28226)`);
+        }
+        return errors;
+    }
     /**
      * Helper to poll for streaming domain payloads and put them in the
      * local {@link tempSpace}.
@@ -720,7 +781,8 @@ export class SyncSagaCoordinator {
                 console.log(`${lc} starting... (I: 26dce86bfca572939885798802d6e926)`);
             }
             let resultDomainPayloads = [];
-            let pending = [...expectedAddrs];
+            const uniqueExpectedAddrs = [...new Set(expectedAddrs)];
+            let pending = [...uniqueExpectedAddrs];
             const start = Date.now();
             /**
              * This needs
@@ -750,8 +812,8 @@ export class SyncSagaCoordinator {
                     await delay(pollIntervalMs);
                 }
             }
-            if (expectedAddrs.length !== resultDomainPayloads.length) {
-                throw new Error(`(UNEXPECTED) expectedAddrs.length !== resultDomainPayloads.length? at this point, we expect all of the payload ibgibs to have been received. (E: 03749a7478c4b8b28bfc86951887a826)`);
+            if (uniqueExpectedAddrs.length !== resultDomainPayloads.length) {
+                throw new Error(`(UNEXPECTED) uniqueExpectedAddrs.length !== resultDomainPayloads.length? at this point, we expect all of the payload ibgibs to have been received. (E: 03749a7478c4b8b28bfc86951887a826)`);
             }
             return resultDomainPayloads;
         }
@@ -1322,12 +1384,11 @@ export class SyncSagaCoordinator {
              * end will have to do the actual merging (assuming feasability).
              */
             const outgoingPayloadIbGibsDomain_conflicts = [];
+            const activeConflicts = [];
             if (conflicts.length > 0) {
                 if (logalot) {
                     console.log(`${lc} [CONFLICT DEBUG] Processing ${conflicts.length} non-terminal conflicts`);
                 }
-                // we will need to resolve conflicts, so no commit yet
-                proposeCommit = false;
                 for (const conflict of conflicts) {
                     const { receiverTipAddr, reason, senderTipAddr, 
                     // latestCommonFrameAddr, // to be determined in this handler
@@ -1389,13 +1450,28 @@ export class SyncSagaCoordinator {
                         const deltaPayloadIbGib = deltaGraph[deltaPayloadAddr];
                         outgoingPayloadIbGibsDomain_conflicts.push(deltaPayloadIbGib);
                     });
-                    if (conflict.accretivePayloadAddrs) {
-                        throw new Error(`(UNEXPECTED) conflict.accretivePayloadAddrs already truthy? This is expected to be falsy at this point in the sync. (E: 6b6b1846779867849cbde208f4374326)`);
+                    const isFastForward = latestCommonFrameAddr === receiverTipAddr;
+                    if (isFastForward) {
+                        if (logalot) {
+                            console.log(`${lc} [CONFLICT DEBUG] TJP ${tjpAddr}: Fast-forward detected (receiver behind sender). Excluding from active conflicts and sending delta payload.`);
+                        }
+                    }
+                    else {
+                        if (conflict.accretivePayloadAddrs) {
+                            throw new Error(`(UNEXPECTED) conflict.accretivePayloadAddrs already truthy? This is expected to be falsy at this point in the sync. (E: 6b6b1846779867849cbde208f4374326)`);
+                        }
+                        conflict.accretivePayloadAddrs = accretivePayloadAddrs;
+                        activeConflicts.push(conflict);
                     }
-                    conflict.accretivePayloadAddrs = accretivePayloadAddrs;
+                }
+                if (activeConflicts.length > 0) {
+                    proposeCommit = false;
+                }
+                else {
+                    proposeCommit = true;
                 }
                 if (logalot) {
-                    console.log(`${lc} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. outgoingPayloadIbGibsDomain_conflicts.length (total outgoing payload ibgibs for ALL conflicts): ${outgoingPayloadIbGibsDomain_conflicts.length}`);
+                    console.log(`${lc} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. Active (divergent) conflicts: ${activeConflicts.length}. outgoingPayloadIbGibsDomain_conflicts.length (total outgoing payload ibgibs for ALL conflicts): ${outgoingPayloadIbGibsDomain_conflicts.length}`);
                 }
             }
             else {
@@ -1434,7 +1510,7 @@ export class SyncSagaCoordinator {
                 /**
                  * these are the modified conflicts with additional information.
                  */
-                conflicts,
+                conflicts: activeConflicts,
                 /**
                  * we're sending these domain ibgibs as payload (they were
                  * requested by receiver and/or they are being sent as delta