@ibgib/core-gib 0.1.27 → 0.1.29

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

@@ -29,10 +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, getSyncIb, getTempSpaceName, isPastFrame } 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,
@@ -57,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]';
 
 /**
@@ -76,10 +74,10 @@ const lcControlDomain = '[ControlDomain]';
  * to a specific Saga session, not fixed node identities.
  */
 export class SyncSagaCoordinator {
-    protected lc: string = `[${SyncSagaCoordinator.name}]`;
+    private lc: string = `[${SyncSagaCoordinator.name}]`;
 
     constructor(
-        protected keystone: KeystoneService_V1
+        private keystone: KeystoneService_V1
     ) {
 
     }
@@ -240,7 +238,11 @@ export class SyncSagaCoordinator {
 
             if (!contextResult) {
                 if (logalot) { console.log(`${lc} Handler returned null (Saga End). (I: 43da8bb6c846b1fe7766332643be0e26)`); }
-                return null;
+                // does this ever hit now?
+                return null; /* <<<< returns early */
+            } else if (contextResult.nextFrameInfo?.sagaComplete) {
+                // this is the current proper workflow I believe as of 01/22/2026
+                return null; /* <<<< returns early */
             }
 
             // #region error conditions throw
@@ -248,8 +250,6 @@ export class SyncSagaCoordinator {
                 throw new Error(`Couldn't handle response saga context. errorMsg: ${contextResult.errorMsg} (E: 7b41a183cf3cb58a5859c803800cf826)`);
             } else if (!contextResult.nextFrameInfo) {
                 throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo falsy? (E: 5740542f5eb8ccb41dfec188d87c1e26)`);
-            } else if (contextResult.nextFrameInfo?.responseWasNull) {
-                throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo.responseWasNull? logic flow should not have gotten here. (E: ae06748d8c0c5e70c92322c8fb0cb426)`);
             }
             // #endregion error conditions throw
 
@@ -278,7 +278,7 @@ export class SyncSagaCoordinator {
         }
     }
 
-    protected async getSessionIdentity({
+    private async getSessionIdentity({
         sagaId,
         metaspace,
         tempSpace,
@@ -329,7 +329,7 @@ export class SyncSagaCoordinator {
      * the NEXT request context.
      * When the Peer responds with data (in the response context), it is resolved and put into `tempSpace`.
      */
-    protected async executeSagaLoop({
+    private async executeSagaLoop({
         initFrame,
         initDomainGraph,
         peer,
@@ -502,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;
             }
 
@@ -511,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?.responseWasNull) {
-                throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo.responseWasNull? logic flow should not have gotten here. (E: 104a32381db816b7183435e805b3d626)`);
             }
             // #endregion error conditions throw
 
@@ -610,7 +612,7 @@ export class SyncSagaCoordinator {
         }
     }
 
-    protected async analyzeDomainIbGibs({
+    private async analyzeDomainIbGibs({
         domainIbGibs,
         space,
     }: {
@@ -656,7 +658,7 @@ export class SyncSagaCoordinator {
      * Generates the first frame containing the Knowledge Vector of the Local Space.
      * This is sent to the Receiver to begin Gap Analysis.
      */
-    protected async createInitFrame({
+    private async createInitFrame({
         sagaId,
         sessionIdentity,
         domainIbGibs,
@@ -739,7 +741,7 @@ export class SyncSagaCoordinator {
      *
      * @returns when all {@link expectedAddrs} are done being transmitted.
      */
-    protected async pollForDomainPayloads({
+    private async pollForDomainPayloads({
         expectedAddrs,
         pollIntervalMs,
         domainPayloadsMap,
@@ -824,7 +826,7 @@ export class SyncSagaCoordinator {
      *
      * This is a one-off on the receiver.
      */
-    public async handleResponseSagaContext({
+    private async handleResponseSagaContext({
         sagaContext,
         initDomainGraph,
         mySpace,
@@ -898,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:
@@ -940,7 +945,7 @@ export class SyncSagaCoordinator {
      * 3.  Identifies what Receiver needs (`deltaRequestAddrInfos`).
      * 4.  Returns an `Ack` frame containing these lists.
      */
-    protected async handleInitFrame({
+    private async handleInitFrame({
         sagaIbGib,
         messageData,
         mySpace,
@@ -970,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
@@ -1015,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
@@ -1029,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)`); }
             }
 
@@ -1040,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,
@@ -1054,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...
 
@@ -1073,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?
@@ -1107,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,
@@ -1115,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.
@@ -1289,7 +1294,7 @@ export class SyncSagaCoordinator {
      *
      * Returns a `Delta` frame.
      */
-    protected async handleAckFrame({
+    private async handleAckFrame({
         sagaContext,
         sagaIbGib,
         initDomainGraph,
@@ -1336,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)`);
@@ -1359,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)
@@ -1492,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)
@@ -1565,70 +1570,6 @@ export class SyncSagaCoordinator {
         }
     }
 
-    private async getPayloadsForRequestedInfos({
-        deltaRequestAddrInfos,
-        mySpace,
-    }: {
-        deltaRequestAddrInfos: SyncSagaRequestAddrInfo[];
-        mySpace: IbGibSpaceAny;
-    }): Promise<IbGib_V1[]> {
-        const lc = `${this.lc}[${this.getPayloadsForRequestedInfos.name}]`;
-        try {
-            if (logalot) { console.log(`${lc} starting... (I: 4fe13d0d80050f20a8b74ba80cee5826)`); }
-            /**
-             * graph of ibgibs we will send to the receiver. addr-based, so will
-             * already be unique (no need to call `unique` on the domains
-             * ibgibs)
-             */
-            const outgoingPayloadIbGibsDomainGraph: FlatIbGibGraph = {};
-            for (const { addr, latestAddrAlreadyHave } of deltaRequestAddrInfos) {
-                let deltaDepGraph: FlatIbGibGraph;
-                if (latestAddrAlreadyHave) {
-                    // already has some, so only get the delta
-                    // remember: if we didn't have the other's latest addr, then
-                    // this would be in the conflicts not requested addrs
-                    deltaDepGraph = await getDeltaDependencyGraph({
-                        ibGibAddr: addr,
-                        latestCommonFrameAddr: latestAddrAlreadyHave,
-                        space: mySpace,
-                        live: true,
-                    });
-                } else {
-                    // doesn't have anything, so get the entire dependency graph
-                    // INEFFICIENT: we've already gotten all of the domain
-                    // dependencies in initDomainGraph, but getDependencyGraph
-                    // only works against a space so we are going to rerun this.
-                    // an optimization would be to adapt/create a new
-                    // getDependencyGraph to work against an existing flat ibgib
-                    // map.
-                    deltaDepGraph = await getDependencyGraph({
-                        ibGibAddr: addr,
-                        space: mySpace,
-                        live: true,
-                    });
-                }
-
-                const depGraphSize = Object.keys(deltaDepGraph).length;
-                if (depGraphSize === 0) {
-                    throw new Error(`(UNEXPECTED) couldn't get requested addrs in mySpace (${mySpace.ib})? How did the receiver know to ask for these addrs if they weren't in our original graph? (E: 281eaebcdf77dd73e8245b2872100826)`);
-                } else {
-                    // we have dependencies!
-                    Object.values(deltaDepGraph).forEach(x => {
-                        outgoingPayloadIbGibsDomainGraph[getIbGibAddr({ ibGib: x })] = x;
-                    });
-                }
-            }
-
-            const result = Object.values(outgoingPayloadIbGibsDomainGraph);
-            return result;
-        } catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)}`);
-            throw error;
-        } finally {
-            if (logalot) { console.log(`${lc} complete.`); }
-        }
-    }
-
     /**
      * Handles the `Delta` frame.
      *
@@ -1639,7 +1580,7 @@ export class SyncSagaCoordinator {
      * 2.  **Fulfillment**: Checks `requests`. If Peer requested data, gathers it and prepares `outgoingPayload`.
      * 3.  **Completion**: If no more requests, transitions to `Commit`.
      */
-    protected async handleDeltaFrame({
+    private async handleDeltaFrame({
         sagaContext,
         sagaIbGib,
         srcGraph,
@@ -1669,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;
 
@@ -1679,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.
@@ -1692,36 +1633,41 @@ 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}`);
-                let ackData: SyncSagaMessageAckData_V1 | undefined;
-
-                if (pastAddrs.length > 0) {
-                    // Batch fetch all past frames
-                    const resPast = await getFromSpace({ addrs: pastAddrs, space: myTempSpace });
-                    if (resPast.success && resPast.ibGibs) {
-                        // Iterate backwards (most recent first) to find the latest Ack
-                        for (let i = resPast.ibGibs.length - 1; i >= 0; i--) {
-                            const pastFrame = resPast.ibGibs[i];
-                            const messageStone = await getSyncSagaMessageFromFrame({
-                                frameIbGib: pastFrame,
-                                space: myTempSpace
-                            });
-                            if (messageStone?.data?.stage === SyncStage.ack) {
-                                ackData = messageStone.data as SyncSagaMessageAckData_V1;
-                                console.log(`${lc} [TEST DEBUG] Found Ack Frame. Conflicts: ${ackData.conflicts?.length || 0}`);
-                                break;
-                            }
-                        }
-                    }
+                if (logalot) { console.log(`${lc} [TEST DEBUG] pastAddrs count: ${pastAddrs.length}`); }
+
+                const sagaHistory = await getFullSyncSagaHistory({
+                    sagaIbGib,
+                    space: mySpace,
+                });
+                // #region validate/sanity sagaHistory
+                if (sagaHistory.length === 0) { throw new Error(`(UNEXPECTED) sagaHistory.length is 0? We're in handleDeltaFrame. So we should have at least init and ack. (E: 815735c9cf756b275719bf434f180826)`); }
+                if (sagaHistory.length === 1) { throw new Error(`(UNEXPECTED) sagaHistory.length is 1? We're in handleDeltaFrame. So we should have at least init and ack. (E: 0e4ef8e3ed088e83b2cdcd18ecea9826)`); }
+                // #endregion validate/sanity sagaHistory
+
+                const ackGraphs = sagaHistory.filter(x =>
+                    x.msgStones.at(0)!.data!.stage === SyncStage.ack
+                );
+                // #region validate/sanity ackGraphs
+                if (ackGraphs.length > 1) {
+                    throw new Error(`(UNEXPECTED) more than one ack stage found in sagaHistory? we're expecting exactly one. (E: 7150983bb3a841caf8acd60826ba4f26)`);
+                } else if (ackGraphs.length === 0) {
+                    throw new Error(`(UNEXPECTED) couldn't find ack stage in sagaHistory? (E: 7d2da859196b86de28e7c8183af1e826)`);
+                }
+                if (ackGraphs[0].msgStones.length !== 1) {
+                    throw new Error(`(UNEXPECTED) ackGraph has more than one msg stone? only one expected right now. (E: f07d388abff8d26f98cbf6e8d3932826)`);
                 }
+                // #endregion validate/sanity ackGraphs
+
+                const ackData = ackGraphs[0].msgStones[0].data as SyncSagaMessageAckData_V1;
+                if (!ackData) { throw new Error(`(UNEXPECTED) ackData falsy? (E: f9af88427f66a8db1ba868b810e8b826)`); }
 
                 if (ackData && ackData.conflicts) {
                     const optimisticConflicts = ackData.conflicts.filter(c => !c.terminal);
@@ -1735,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?
@@ -1753,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?
                             }
                         }
@@ -1785,20 +1731,8 @@ export class SyncSagaCoordinator {
                     stage: SyncStage.delta,
                     payloadAddrs: outgoingPayload.map(p => getIbGibAddr({ ibGib: p })),
                     requests: hasMyRequests ? myRequests : undefined,
-                    proposeCommit: !hasMyRequests // If we are sending data but have no requests, we VALIDATE PROPOSAL?
-                    // Wait. If we send data, we are NOT committing yet.
-                    // We are sending data. The OTHER side must ingest it.
-                    // So proposeCommit = true?
-                    // "Here is the data. I'm done. If you are good, let's commit."
-                    // Yes.
                 };
 
-                // BUT if `peerProposesCommit` was true, and we are sending data, we are effectively rejecting/delaying it.
-                // We just send the Delta. Peer receives it, ingests, sees ProposeCommit=True (from us), and then Commits.
-
-                // So yes, proposeCommit = true.
-                responseDeltaData.proposeCommit = true;
-
                 const deltaStone = await this.createSyncMsgStone({
                     data: responseDeltaData,
                     localSpace: mySpace,
@@ -1813,42 +1747,45 @@ export class SyncSagaCoordinator {
                     metaspace,
                 });
 
-                // Build control payloads: frame + its dependencies (msg stone, identity)
-                const payloadIbGibsControl: IbGib_V1[] = [deltaFrame, deltaStone];
-                if (identity) { payloadIbGibsControl.push(identity); }
-
-                // return { frame: deltaFrame, payloadIbGibsControl, payloadIbGibsDomain: outgoingPayload };
                 return { frame: deltaFrame, payloadIbGibsDomain: outgoingPayload };
-                // throw new Error(`not implemented (E: 2b38a8afb6d84efcee5ab51673387826)`);
-
             } else {
                 // We have nothing to send.
 
                 if (peerProposesCommit) {
                     // Peer is done. We are done. -> Commit.
-                    const commitData: SyncSagaMessageCommitData_V1 = {
-                        sagaId: deltaData.sagaId,
-                        stage: SyncStage.commit,
-                        success: true,
-                    };
-
-                    const commitStone = await this.createSyncMsgStone({
-                        data: commitData,
-                        localSpace: mySpace,
-                        metaspace
+                    // 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({
+                            sagaIbGib,
+                            errors: validationErrors,
+                            metaspace, mySpace,
+                            identity,
+                        });
+                        return { frame: errorCommitFrame, }; /* <<<< returns early */
+                    }
 
-                    const commitFrame = await this.evolveSyncSagaIbGib({
-                        prevSagaIbGib: sagaIbGib,
-                        msgStones: [commitStone],
-                        sessionIdentity: identity,
+                    await this.executeLocalCommit({
+                        sagaHistory: history,
+                        deltaFrame: sagaIbGib,
+                        localTempSpace: myTempSpace,
                         localSpace: mySpace,
-                        metaspace
-                    });
+                        metaspace,
+                    })
 
-                    // Build control payloads for commit
-                    const commitCtrlPayloads: IbGib_V1[] = [commitFrame, commitStone];
-                    if (identity) { commitCtrlPayloads.push(identity); }
+                    const commitFrame = await this.createCommitFrame({
+                        sagaIbGib,
+                        errors: undefined,
+                        metaspace,
+                        mySpace,
+                        identity,
+                    });
 
                     return { frame: commitFrame, };
 
@@ -1924,9 +1861,246 @@ export class SyncSagaCoordinator {
         }
 
     }
+    /**
+     * should throw if fails
+     */
+    private async executeLocalCommit({
+        deltaFrame,
+        commitFrame,
+        sagaHistory,
+        metaspace, localSpace, localTempSpace,
+        identity,
+    }: {
+        deltaFrame?: SyncIbGib_V1;
+        commitFrame?: SyncIbGib_V1;
+        sagaHistory: SyncSagaFrameDependencyGraph[];
+        metaspace: MetaspaceService;
+        localSpace: IbGibSpaceAny;
+        localTempSpace: IbGibSpaceAny;
+        identity?: KeystoneIbGib_V1;
+    }): Promise<void> {
+        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)`); }
 
-    protected async handleCommitFrame({
+            // #region validate/sanity
+            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
+            // * register each and every iteration of each timeline (including
+            //   stones, which are like their own sealed timeline of length 1)
+
+            const allPayloadAddrsDomainTransferred: IbGibAddr[] = [];
+            const fnAddPayloadAddr = (addr: IbGibAddr) => {
+                if (!allPayloadAddrsDomainTransferred.includes(addr)) {
+                    allPayloadAddrsDomainTransferred.push(addr);
+                }
+            }
+
+            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) {
+                        const ackData = msgStone.data as SyncSagaMessageAckData_V1;
+                        if (ackData.pushOfferInfos && ackData.pushOfferInfos.length > 0) {
+                            ackData.pushOfferInfos.forEach(info => {
+                                info.addrs.forEach(addr => fnAddPayloadAddr(addr));
+                            });
+                        }
+                    } else if (msgStone.data.stage === SyncStage.delta) {
+                        const deltaData = msgStone.data as SyncSagaMessageDeltaData_V1;
+                        if (deltaData.payloadAddrsDomain && deltaData.payloadAddrsDomain.length > 0) {
+                            deltaData.payloadAddrsDomain.forEach(addr => fnAddPayloadAddr(addr));
+                        }
+                    }
+                })
+            });
+
+            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[] = [];
+            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)`); }
+
+                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)`); }
+
+                const { mapWithTjp_NoDna, mapWithTjp_YesDna, mapWithoutTjps } =
+                    splitPerTjpAndOrDna({ ibGibs: payload_NonDnas, filterPrimitives: true });
+
+                // 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: nontjp,
+                        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;
+        } finally {
+            if (logalot) { console.log(`${lc} complete.`); }
+        }
+    }
+
+    private async createCommitFrame({
+        sagaIbGib,
+        errors,
+        metaspace,
+        mySpace,
+        identity,
+    }: {
+        sagaIbGib: SyncIbGib_V1,
+        /**
+         * if truthy and non-empty, will create an errored commit frame (data
+         * has `success: false`)
+         */
+        errors?: string[],
+        metaspace: MetaspaceService,
+        mySpace: IbGibSpaceAny,
+        identity: KeystoneIbGib_V1 | undefined,
+    }): Promise<SyncIbGib_V1> {
+        const lc = `[${this.createCommitFrame.name}]`;
+        try {
+            if (logalot) { console.log(`${lc} starting... (I: 48fc57c023f80122135a284855757526)`); }
+            const commitData: SyncSagaMessageCommitData_V1 = errors && errors.length > 0 ?
+                {
+                    // errored
+                    sagaId: sagaIbGib.data!.uuid,
+                    stage: SyncStage.commit,
+                    success: false,
+                    errors,
+                } :
+                {
+                    // not errored
+                    sagaId: sagaIbGib.data!.uuid,
+                    stage: SyncStage.commit,
+                    success: true,
+                };
+
+            const commitStone = await this.createSyncMsgStone({
+                data: commitData,
+                localSpace: mySpace,
+                metaspace
+            });
+            const commitFrame = await this.evolveSyncSagaIbGib({
+                prevSagaIbGib: sagaIbGib,
+                msgStones: [commitStone],
+                sessionIdentity: identity,
+                localSpace: mySpace,
+                metaspace,
+            });
+            return commitFrame;
+        } catch (error) {
+            console.error(`${lc} ${extractErrorMsg(error)}`);
+            throw error;
+        } finally {
+            if (logalot) { console.log(`${lc} complete.`); }
+        }
+    }
+
+    private async handleCommitFrame({
         sagaIbGib,
         mySpace,
         myTempSpace,
@@ -1943,23 +2117,66 @@ export class SyncSagaCoordinator {
         try {
             if (logalot) { console.log(`${lc} starting... (I: e179573bdd881202f8ba3168da1c3826)`); }
 
+            if (!sagaIbGib.data) { throw new Error(`(UNEXPECTED) sagaIbGib.data falsy? (E: cbc31dbb7d28b5b8c8cddb510d7d2826)`); }
 
+            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,
+                    space: mySpace,
+                });
+                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 */
+                }
 
-            // 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 null to signal saga completion.
+                await this.executeLocalCommit({
+                    commitFrame: sagaIbGib,
+                    sagaHistory: history,
+                    localSpace: mySpace,
+                    localTempSpace: myTempSpace,
+                    metaspace,
+                });
 
-            // Note: Currently we don't have explicit cleanup logic implemented here yet (TODO).
-            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.`); }
 
-            return { responseWasNull: true };
+                // the holy grail!
+                return { sagaComplete: true };
+            }
         } catch (error) {
-            console.error(`${lc} ${extractErrorMsg(error)}`);
-            throw error;
+            const emsg = `${lc} ${extractErrorMsg(error)}`;
+            console.error(emsg);
+            const errorCommitFrame = await this.createCommitFrame({
+                sagaIbGib,
+                errors: [emsg],
+                metaspace,
+                mySpace,
+                identity,
+            });
+            return { frame: errorCommitFrame }
         } finally {
             if (logalot) { console.log(`${lc} complete.`); }
         }
@@ -1968,7 +2185,7 @@ export class SyncSagaCoordinator {
 
     // #endregion Handlers
 
-    protected async createSyncMsgStone<TStoneData extends SyncSagaMessageData_V1>({
+    private async createSyncMsgStone<TStoneData extends SyncSagaMessageData_V1>({
         data,
         localSpace,
         metaspace,
@@ -2000,11 +2217,75 @@ export class SyncSagaCoordinator {
         }
     }
 
+    private async getPayloadsForRequestedInfos({
+        deltaRequestAddrInfos,
+        mySpace,
+    }: {
+        deltaRequestAddrInfos: SyncSagaRequestAddrInfo[];
+        mySpace: IbGibSpaceAny;
+    }): Promise<IbGib_V1[]> {
+        const lc = `${this.lc}[${this.getPayloadsForRequestedInfos.name}]`;
+        try {
+            if (logalot) { console.log(`${lc} starting... (I: 4fe13d0d80050f20a8b74ba80cee5826)`); }
+            /**
+             * graph of ibgibs we will send to the receiver. addr-based, so will
+             * already be unique (no need to call `unique` on the domains
+             * ibgibs)
+             */
+            const outgoingPayloadIbGibsDomainGraph: FlatIbGibGraph = {};
+            for (const { addr, latestAddrAlreadyHave } of deltaRequestAddrInfos) {
+                let deltaDepGraph: FlatIbGibGraph;
+                if (latestAddrAlreadyHave) {
+                    // already has some, so only get the delta
+                    // remember: if we didn't have the other's latest addr, then
+                    // this would be in the conflicts not requested addrs
+                    deltaDepGraph = await getDeltaDependencyGraph({
+                        ibGibAddr: addr,
+                        latestCommonFrameAddr: latestAddrAlreadyHave,
+                        space: mySpace,
+                        live: true,
+                    });
+                } else {
+                    // doesn't have anything, so get the entire dependency graph
+                    // INEFFICIENT: we've already gotten all of the domain
+                    // dependencies in initDomainGraph, but getDependencyGraph
+                    // only works against a space so we are going to rerun this.
+                    // an optimization would be to adapt/create a new
+                    // getDependencyGraph to work against an existing flat ibgib
+                    // map.
+                    deltaDepGraph = await getDependencyGraph({
+                        ibGibAddr: addr,
+                        space: mySpace,
+                        live: true,
+                    });
+                }
+
+                const depGraphSize = Object.keys(deltaDepGraph).length;
+                if (depGraphSize === 0) {
+                    throw new Error(`(UNEXPECTED) couldn't get requested addrs in mySpace (${mySpace.ib})? How did the receiver know to ask for these addrs if they weren't in our original graph? (E: 281eaebcdf77dd73e8245b2872100826)`);
+                } else {
+                    // we have dependencies!
+                    Object.values(deltaDepGraph).forEach(x => {
+                        outgoingPayloadIbGibsDomainGraph[getIbGibAddr({ ibGib: x })] = x;
+                    });
+                }
+            }
+
+            const result = Object.values(outgoingPayloadIbGibsDomainGraph);
+            return result;
+        } catch (error) {
+            console.error(`${lc} ${extractErrorMsg(error)}`);
+            throw error;
+        } finally {
+            if (logalot) { console.log(`${lc} complete.`); }
+        }
+    }
+
 
     /**
      * Evolves the saga timeline with a new frame.
      */
-    protected async evolveSyncSagaIbGib({
+    private async evolveSyncSagaIbGib({
         prevSagaIbGib,
         conflictStrategy,
         msgStones,
@@ -2128,7 +2409,7 @@ export class SyncSagaCoordinator {
         }
     }
 
-    protected async getStageAndPayloadFromFrame({
+    private async getStageAndPayloadFromFrame({
         sagaFrame,
         space
     }: {
@@ -2164,7 +2445,7 @@ export class SyncSagaCoordinator {
         }
     }
 
-    protected sortTimelinesTopologically(timelines: { [tjp: string]: IbGib_V1[] }): string[] {
+    private sortTimelinesTopologically(timelines: { [tjp: string]: IbGib_V1[] }): string[] {
         const lc = `${this.lc}[${this.sortTimelinesTopologically.name}]`;
         const tjps = Object.keys(timelines);
         if (tjps.length === 0) { return []; }