@ibgib/core-gib 0.1.19 → 0.1.21

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

@@ -16,6 +16,8 @@ import { SYNC_SAGA_MSG_ATOM } from "./sync-saga-message/sync-saga-message-consta
 import { SyncSagaContextCmd } from "./sync-saga-context/sync-saga-context-types.mjs";
 import { createSyncSagaContext } from "./sync-saga-context/sync-saga-context-helpers.mjs";
 import { newupSubject } from "../common/pubsub/subject/subject-helper.mjs";
+import { mergeDivergentTimelines } from "./strategies/conflict-optimistic.mjs";
+import { getSyncSagaMessageFromFrame } from "./sync-saga-message/sync-saga-message-helpers.mjs";
 const logalot = GLOBAL_LOG_A_LOT || true;
 /**
  * Orchestrates the synchronization process between two spaces (Source and Destination).
@@ -49,11 +51,15 @@ export class SyncSagaCoordinator {
      * @param opts.domainIbGibs - The root ibgibs defining the scope of the sync.
      * @param opts.useSessionIdentity - (Optional) Whether to create an ephemeral session identity. Default: true.
      */
-    async sync({ peer, localSpace, metaspace, domainIbGibs, useSessionIdentity, }) {
+    async sync({ peer, localSpace: _localSpace, source: _source, metaspace, domainIbGibs, conflictStrategy = 'abort', useSessionIdentity = true, }) {
         const lc = `${this.lc}[${this.sync.name}]`;
         if (logalot) {
             console.log(`${lc} starting...`);
         }
+        const localSpace = (_source || _localSpace);
+        if (!localSpace) {
+            throw new Error(`${lc} source (or localSpace) required (E: 8a9b0c1d)`);
+        }
         // 1. SETUP SAGA METADATA
         const sagaId = await getUUID();
         // Setup Observable & Promise
@@ -97,9 +103,7 @@ export class SyncSagaCoordinator {
                 const sessionIdentity = useSessionIdentity
                     ? await this.getSessionIdentity({ sagaId, metaspace, tempSpace })
                     : undefined;
-                if (logalot) {
-                    console.log(`${lc} sessionIdentity: ${sessionIdentity ? pretty(sessionIdentity) : 'undefined'} (I: abc01872800b3a66b819a05898bba826)`);
-                }
+                // if (logalot) { console.log(`${lc} sessionIdentity: ${sessionIdentity ? pretty(sessionIdentity) : 'undefined'} (I: abc01872800b3a66b819a05898bba826)`); }
                 // 3. CREATE INITIAL FRAME (Stage.init)
                 const { sagaFrame: initFrame, srcGraph } = await this.createInitFrame({
                     sagaId,
@@ -108,6 +112,7 @@ export class SyncSagaCoordinator {
                     domainIbGibs,
                     tempSpace,
                     metaspace,
+                    conflictStrategy
                 });
                 // 4. EXECUTE SAGA LOOP (FSM)
                 const syncedIbGibs = await this.executeSagaLoop({
@@ -259,13 +264,25 @@ export class SyncSagaCoordinator {
                 });
             }
             // B. Transmit
-            if (logalot) {
-                console.log(`${lc} transmitting... requestCtx: ${pretty(requestCtx)} (I: 8cf20817c66899abdb1e76df50356826)`);
-            }
+            // if (logalot) { console.log(`${lc} transmitting... requestCtx: ${pretty(requestCtx)} (I: 8cf20817c66899abdb1e76df50356826)`); }
             updates$.next(requestCtx);
             const responseCtx = await peer.witness(requestCtx);
             // C. Handle Response
             if (!responseCtx) {
+                // Check if we just sent a Commit frame. If so, peer's silence is success/expected.
+                if (currentFrame) {
+                    const msg = await getSyncSagaMessageFromFrame({ frameIbGib: currentFrame, space: localSpace });
+                    if (logalot) {
+                        console.log(`${lc} Checking currentFrame stage: ${msg?.data?.stage} (Expected: ${SyncStage.commit})`);
+                    }
+                    if (msg?.data?.stage === SyncStage.commit) {
+                        if (logalot) {
+                            console.log(`${lc} Sender sent Commit. Peer returned no response. Saga Complete.`);
+                        }
+                        currentFrame = null;
+                        break;
+                    }
+                }
                 throw new Error(`responseCtx falsy. Peer returned no response context (E: c099d8073b48d85e881f917835158f26)`);
                 // console.warn(`${lc} Peer returned no response context. Ending loop.`);
                 // currentFrame = null;
@@ -305,7 +322,8 @@ export class SyncSagaCoordinator {
             const result = await this.handleSagaFrame({
                 sagaIbGib: remoteFrame,
                 srcGraph,
-                space: localSpace, // Must be localSpace (Source) to find domain data
+                destSpace: localSpace, // Query existing data from localSpace (Source)
+                tempSpace: tempSpace, // Transaction space for saga frames
                 identity: sessionIdentity,
                 metaspace
             });
@@ -318,6 +336,82 @@ export class SyncSagaCoordinator {
         }
         return allReceivedIbGibs;
     }
+    /**
+     * Helper to get Knowledge Vector for specific domain ibGibs or TJPs.
+     * Useful for testing and external validation.
+     */
+    async getKnowledgeVector({ space, metaspace, domainIbGibs, tjpAddrs, }) {
+        const lc = `${this.lc}[${this.getKnowledgeVector.name}]`;
+        try {
+            if (logalot) {
+                console.log(`${lc} starting... (I: e184f8a7818666febfbbd2d841ed3826)`);
+            }
+            console.dir(space);
+            if (!(domainIbGibs && domainIbGibs.length > 0) &&
+                !(tjpAddrs && tjpAddrs.length > 0)) {
+                throw new Error(`(UNEXPECTED) domainIbGibs and tjpAddrs falsy/empty? we need one or the other (E: f674285111c8648398cd79d8c08ec826)`);
+            }
+            if ((domainIbGibs && domainIbGibs.length > 0) &&
+                (tjpAddrs && tjpAddrs.length > 0)) {
+                throw new Error(`(UNEXPECTED) both domainIbGibs and tjpAddrs truthy? only pass in one or the other. (E: f674285111c8648398cd79d8c08ec826)`);
+            }
+            let tjps = [];
+            if (tjpAddrs) {
+                tjps = tjpAddrs;
+            }
+            else if (domainIbGibs && domainIbGibs.length > 0) {
+                // Extract TJPs from domain Ibgibs
+                if (logalot) {
+                    console.log(`${lc} domainIbGibs (${domainIbGibs.length}) provided.  (I: a378995a0658af1f086ac1f297486c26)`);
+                }
+                const { mapWithTjp_YesDna, mapWithTjp_NoDna } = splitPerTjpAndOrDna({ ibGibs: domainIbGibs });
+                if (logalot) {
+                    console.log(`${lc}[TEST DEBUG] mapWithTjp_YesDna: ${JSON.stringify(mapWithTjp_YesDna)} (I: 287e22897148298e185712c8d50cfb26)`);
+                }
+                if (logalot) {
+                    console.log(`${lc}[TEST DEBUG] mapWithTjp_NoDna: ${JSON.stringify(mapWithTjp_NoDna)} (I: 1bdc62656294aed0f9df334647dc7326)`);
+                }
+                const allWithTjp = [...Object.values(mapWithTjp_YesDna), ...Object.values(mapWithTjp_NoDna)];
+                const timelineMap = getTimelinesGroupedByTjp({ ibGibs: allWithTjp });
+                if (logalot) {
+                    console.log(`${lc}[TEST DEBUG] timelineMap: ${JSON.stringify(timelineMap)} (I: 2cc04898e5f85179fb1ac7f827abc426)`);
+                }
+                tjps = Object.keys(timelineMap);
+                if (logalot) {
+                    console.log(`${lc}[TEST DEBUG] tjps: ${tjps} (I: 3dd548667cbd967c68e57c88dc570826)`);
+                }
+            }
+            else {
+                // No info provided. Return empty? Or throw?
+                // User test context implied "everything", but implementation requires scope.
+                console.warn(`${lc} No domainIbGibs or tjpAddrs provided. Returning empty KV.`);
+                return {};
+            }
+            if (tjps.length === 0) {
+                return {};
+            }
+            if (logalot) {
+                console.log(`${lc} getting latest addrs for tjps: ${tjps} (I: d4e7080b8ba8187c583b82fd91ac0626)`);
+            }
+            const res = await getLatestAddrs({ space, tjpAddrs: tjps });
+            if (!res.data || !res.data.latestAddrsMap) {
+                throw new Error(`${lc} Failed to get latest addrs. (E: 7a8b9c0d)`);
+            }
+            if (logalot) {
+                console.log(`${lc}[TEST DEBUG] res.data.latestAddrsMap: ${JSON.stringify(res.data.latestAddrsMap)} (I: a8e128bdf80898ac2e6d8021a5bff726)`);
+            }
+            return res.data.latestAddrsMap;
+        }
+        catch (error) {
+            console.error(`${lc} ${extractErrorMsg(error)}`);
+            throw error;
+        }
+        finally {
+            if (logalot) {
+                console.log(`${lc} complete.`);
+            }
+        }
+    }
     async analyzeTimelines({ domainIbGibs, space, }) {
         const lc = `${this.lc}[${this.analyzeTimelines.name}]`;
         const srcGraph = await getDependencyGraph({
@@ -346,7 +440,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.
      */
-    async createInitFrame({ sagaId, sessionIdentity, localSpace, domainIbGibs, tempSpace, metaspace }) {
+    async createInitFrame({ sagaId, sessionIdentity, localSpace, domainIbGibs, tempSpace, metaspace, conflictStrategy, }) {
         const lc = `${this.lc}[${this.createInitFrame.name}]`;
         try {
             if (logalot) {
@@ -371,23 +465,31 @@ export class SyncSagaCoordinator {
                 const tip = timeline.at(-1);
                 initData.knowledgeVector[tjp] = getIbGibAddr({ ibGib: tip });
             });
+            if (logalot) {
+                console.log(`${lc} SyncStage.init: ${SyncStage.init}, SyncStage.commit: ${SyncStage.commit}`);
+                console.log(`${lc} initData.stage: ${initData.stage}`);
+            }
             const initStone = await this.createSyncMsgStone({
                 data: initData,
                 space: tempSpace,
                 metaspace
             });
-            if (logalot) {
-                console.log(`${lc} initStone: ${pretty(initStone)} (I: 06e532f8a408549069474e96bed44826)`);
-            }
+            // if (logalot) { console.log(`${lc} initStone: ${pretty(initStone)} (I: 06e532f8a408549069474e96bed44826)`); }
             const sagaFrame = await this.evolveSyncSagaIbGib({
                 msgStones: [initStone],
                 identity: sessionIdentity,
                 space: tempSpace,
+                metaspace,
+                conflictStrategy,
+            });
+            // IMMEDIATELY persist to both spaces for audit trail
+            await this.ensureSagaFrameInBothSpaces({
+                frame: sagaFrame,
+                destSpace: localSpace, // localSpace is the Sender's destSpace
+                tempSpace,
                 metaspace
             });
-            if (logalot) {
-                console.log(`${lc} sagaFrame (init): ${pretty(sagaFrame)} (I: b3d6a8be69248f18713cc3073cb08626)`);
-            }
+            // if (logalot) { console.log(`${lc} sagaFrame (init): ${pretty(sagaFrame)} (I: b3d6a8be69248f18713cc3073cb08626)`); }
             return { sagaFrame, srcGraph };
         }
         catch (error) {
@@ -413,7 +515,7 @@ export class SyncSagaCoordinator {
      * *   If running on **Sender**: Handles `Ack` (via `handleAckFrame`).
      * *   If running on **Either**: Handles `Delta` (via `handleDeltaFrame`) or `Commit`.
      */
-    async handleSagaFrame({ sagaIbGib, srcGraph, space, identity, identitySecret, metaspace, }) {
+    async handleSagaFrame({ sagaIbGib, srcGraph, destSpace, tempSpace, identity, identitySecret, metaspace, }) {
         const lc = `${this.lc}[${this.handleSagaFrame.name}]`;
         try {
             if (logalot) {
@@ -426,21 +528,19 @@ export class SyncSagaCoordinator {
                 console.log(`${lc} sagaIbGib: ${pretty(sagaIbGib)} (I: 1b99d87d262e9d18d8a607a80b1a0126)`);
             }
             // Get Stage from Stone (or Frame for Init fallback)
-            const { stage, messageData } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space });
+            const { stage, messageData } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space: tempSpace });
             if (logalot) {
                 console.log(`${lc} handling frame stage: ${stage}`);
             }
             switch (stage) {
                 case SyncStage.init:
-                    return await this.handleInitFrame({ sagaIbGib, messageData, space, metaspace, identity, identitySecret });
+                    return await this.handleInitFrame({ sagaIbGib, messageData, metaspace, destSpace, tempSpace, identity, identitySecret });
                 case SyncStage.ack:
-                    return await this.handleAckFrame({ sagaIbGib, srcGraph, space, metaspace, identity });
+                    return await this.handleAckFrame({ sagaIbGib, srcGraph, metaspace, destSpace, tempSpace, identity });
                 case SyncStage.delta:
-                    return await this.handleDeltaFrame({ sagaIbGib, srcGraph, space, identity, metaspace });
+                    return await this.handleDeltaFrame({ sagaIbGib, srcGraph, metaspace, destSpace, tempSpace, identity, });
                 case SyncStage.commit:
-                    return await this.handleCommitFrame({ sagaIbGib, space });
-                case SyncStage.conflict:
-                    return await this.handleConflictFrame({ sagaIbGib, space });
+                    return await this.handleCommitFrame({ sagaIbGib, metaspace, destSpace, tempSpace, identity, });
                 default:
                     throw new Error(`${lc} (UNEXPECTED) Unknown sync stage: ${stage} (E: 9c2b4c8a6d34469f8263544710183355)`);
             }
@@ -468,22 +568,25 @@ export class SyncSagaCoordinator {
      * 3.  Identifies what Receiver needs (`deltaReqAddrs`).
      * 4.  Returns an `Ack` frame containing these lists.
      */
-    async handleInitFrame({ sagaIbGib, messageData, space, metaspace, identity, identitySecret, }) {
+    async handleInitFrame({ sagaIbGib, messageData, destSpace, tempSpace, metaspace, identity, identitySecret, }) {
         const lc = `${this.lc}[${this.handleInitFrame.name}]`;
+        console.log(`${lc} [TEST DEBUG] Received destSpace: ${destSpace.data?.name || destSpace.ib} (uuid: ${destSpace.data?.uuid || '[no uuid]'})`);
         if (logalot) {
             console.log(`${lc} starting...`);
         }
         // Extract Init Data
         const initData = messageData; // Using renamed variable for clarity
-        if (logalot) {
-            console.log(`${lc} initData: ${pretty(initData)} (I: 46b0f8441b96ad7a388f1ce3239dd826)`);
+        if (initData.stage !== SyncStage.init) {
+            throw new Error(`${lc} Invalid init frame: initData.stage !== SyncStage.init (E: 8a2b3c4d5e6f7g8h)`);
         }
+        // if (logalot) { console.log(`${lc} initData: ${pretty(initData)} (I: 46b0f8441b96ad7a388f1ce3239dd826)`); }
         if (!initData || !initData.knowledgeVector) {
             throw new Error(`${lc} Invalid init frame: missing knowledgeVector (E: ed02c869e028d2d06841b9c7f80f2826)`);
         }
+        // Determine Strategy from Saga Data (since V1 stores it in root)
+        const conflictStrategy = sagaIbGib.data.conflictStrategy || 'abort';
         // 2. Gap Analysis
         const conflicts = [];
-        const conflictStrategy = initData.conflictStrategy || 'abort'; // Default to abort if not specified, or we should parameterize this
         const deltaReqAddrs = [];
         const pushOfferAddrs = [];
         // Stones Analysis (Constants / Non-TJPs)
@@ -493,7 +596,7 @@ export class SyncSagaCoordinator {
                 console.log(`${lc} processing stones: ${stones.length}`);
             }
             // Check if we have these stones
-            const resStones = await getFromSpace({ space, addrs: stones });
+            const resStones = await getFromSpace({ space: destSpace, addrs: stones });
             const addrsNotFound = resStones.rawResultIbGib?.data?.addrsNotFound;
             if (addrsNotFound && addrsNotFound.length > 0) {
                 if (logalot) {
@@ -511,6 +614,7 @@ export class SyncSagaCoordinator {
             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} remoteTjps: ${pretty(remoteTjps)} (I: 86ea4c53db0dc184c8b253386c402126)`);
         }
@@ -519,7 +623,7 @@ export class SyncSagaCoordinator {
         if (remoteTjps.length > 0) {
             // Batch get latest addrs for the TJPs
             const resGetLatestAddrs = await getLatestAddrs({
-                space,
+                space: destSpace,
                 tjpAddrs: remoteTjps,
             });
             if (!resGetLatestAddrs.data) {
@@ -529,6 +633,7 @@ export class SyncSagaCoordinator {
                 throw new Error(`(UNEXPECTED) resGetLatestAddrs.data.latestAddrsMap falsy? (E: 16bc386dd51d0ff53a49620b1e641826)`);
             }
             localKV = resGetLatestAddrs.data.latestAddrsMap;
+            console.log(`${lc} [TEST DEBUG] localKV: ${JSON.stringify(localKV)}`);
             if (logalot) {
                 console.log(`${lc} localKV: ${pretty(localKV)} (I: 980975642cbccd8018cf0cd808d30826)`);
             }
@@ -539,21 +644,25 @@ export class SyncSagaCoordinator {
             const localAddr = localKV[tjp];
             if (!localAddr) {
                 // We (Receiver) don't have this timeline. Request it.
+                console.log(`${lc} [TEST DEBUG] Missing local timeline for TJP: ${tjp}. Requesting remoteAddr: ${remoteAddr}`);
                 deltaReqAddrs.push(remoteAddr);
                 continue;
             }
             if (localAddr === remoteAddr) {
                 // Synced
+                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...`);
             // Check if Remote is in Local's PAST (Local is Ahead -> Push Offer)
             // (Sender has older version, Receiver has newer) -> Receiver Offers Push
             const isRemoteInPast = await isPastFrame({
                 olderAddr: remoteAddr,
                 newerAddr: localAddr,
-                space,
+                space: destSpace,
             });
             if (isRemoteInPast) {
+                console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Remote is in past - offering push`);
                 pushOfferAddrs.push(localAddr);
             }
             else {
@@ -563,28 +672,54 @@ export class SyncSagaCoordinator {
                 const isLocalInPast = await isPastFrame({
                     olderAddr: localAddr,
                     newerAddr: remoteAddr,
-                    space,
+                    space: destSpace,
                 });
                 if (isLocalInPast) {
                     // Fast-Forward: We update to remote's tip.
+                    console.log(`${lc} [TEST DEBUG] TJP ${tjp}: Local is in past - requesting delta`);
                     deltaReqAddrs.push(remoteAddr);
                 }
                 else {
                     // DIVERGENCE: Both have changes the other doesn't know about.
-                    conflicts.push({ tjp, localAddr, remoteAddr, reason: 'divergence' });
-                    // Conflict Strategy Handling
-                    // TODO: Implement "manual" strategy (requires user intervention/pause)
-                    // TODO: Implement "local_wins" strategy
-                    // TODO: Implement "server_wins" strategy
+                    console.log(`${lc} [TEST DEBUG] TJP ${tjp}: DIVERGENCE DETECTED! conflictStrategy=${conflictStrategy}`);
                     if (conflictStrategy === 'abort') {
-                        // We will abort immediately after this loop check if any conflicts exist
+                        // Abort Strategy: We will treat this as terminal.
+                        // But for Unified Ack, we just mark it terminal in the list?
+                        // Or do we actually throw/abort the saga?
+                        // Current logic (below) aborts the saga if ANY conflict is terminal/abort.
+                        conflicts.push({
+                            tjpAddr: tjp,
+                            localAddr: localAddr,
+                            remoteAddr,
+                            timelineAddrs: [], // Not needed for abort
+                            reason: 'divergence',
+                            terminal: true
+                        });
                     }
                     else if (conflictStrategy === 'optimistic') {
-                        // Optimistic: We Try to resolve by syncing timeline-by-timeline.
-                        // We request the remote data (deltaReq) and will attempt to merge later?
-                        // OR we treat it as a delta request for now, hoping the merge logic handles it?
-                        // For now, we request the remote tip.
-                        deltaReqAddrs.push(remoteAddr);
+                        // Optimistic: We want to resolving this.
+                        // We need to send our history to the Sender so they can Merge.
+                        // Fetch Full History for Local Timeline
+                        // Note: We might optimize this to only send "recent" history if we had a KV?
+                        // But for now, get full past.
+                        // Optimization: localKV might not have full history.
+                        // We need to inspect the 'past' of the local tip.
+                        // We need the ACTUAL object to get the past.
+                        // We have localAddr.
+                        const resLocalTip = await getFromSpace({ space: destSpace, addr: localAddr });
+                        const localTip = resLocalTip.ibGibs?.[0];
+                        if (!localTip) {
+                            throw new Error(`${lc} Failed to load local tip for conflict resolution. (E: 8f9b2c3d4e5f6g7h)`);
+                        }
+                        const timelineAddrs = [localAddr, ...(localTip.rel8ns?.past || [])];
+                        conflicts.push({
+                            tjpAddr: tjp,
+                            localAddr: localAddr,
+                            remoteAddr,
+                            timelineAddrs,
+                            reason: 'divergence',
+                            terminal: false
+                        });
                     }
                     else {
                         throw new Error(`${lc} Unsupported conflict strategy: ${conflictStrategy} (E: 2a9b3c4d5e6f7g8h9i0j)`);
@@ -592,37 +727,29 @@ export class SyncSagaCoordinator {
                 }
             }
         }
-        if (conflicts.length > 0 && conflictStrategy === 'abort') {
+        // Check if we should ABORT (if any conflict is terminal)
+        const hasTerminalConflicts = conflicts.some(c => c.terminal);
+        if (hasTerminalConflicts) {
             // Abort Strategy: Kill the saga.
             if (logalot) {
-                console.warn(`${lc} ABORTING Sync Saga due to conflicts: ${JSON.stringify(conflicts)}`);
-            }
-            const sagaId = sagaIbGib.data.uuid;
-            const conflictData = {
-                sagaId,
-                stage: SyncStage.conflict,
-                conflictStrategy,
-                isTerminal: true,
-                conflicts,
-            };
-            const conflictStone = await this.createSyncMsgStone({
-                data: conflictData,
-                space,
-                metaspace,
-            });
-            const conflictFrame = await this.evolveSyncSagaIbGib({
-                prevSagaIbGib: sagaIbGib,
-                msgStones: [conflictStone],
-                identity,
-                space,
-                metaspace,
-            });
-            return { frame: conflictFrame };
+                console.warn(`${lc} ABORTING Sync Saga due to terminal conflicts: ${JSON.stringify(conflicts)}`);
+            }
+            // We reuse the ConflictData structure for terminal aborts?
+            // Or do we send an Ack with terminal conflicts?
+            // Original design had explicit Conflict Frame for Abort.
+            // Let's stick to that for purely terminal cases to be safe/explicit?
+            // Or Unified: Just send Ack with terminal=true conflicts. Sender sees them and aborts.
+            // Decision: Unified Ack for everything is cleaner protocol.
+            // But wait, the original code below creates a Conflict Stone.
+            // Let's preserve the explicit 'Conflict' frame for total aborts if that's easier,
+            // OR fully switch to Ack.
+            // Protocol states: Init -> Ack. If Ack contains terminal errors, Sender can Commit(Fail).
+            // Let's use Ack with conflicts.
         }
         // 2. Add Push Offers (Missing in Local)
         // Check if we have them. If not, ask for them.
         for (const addr of pushOfferAddrs) {
-            const hasIt = await getFromSpace({ addr, space });
+            const hasIt = await getFromSpace({ addr, space: destSpace });
             if (!hasIt.success || !hasIt.ibGibs || hasIt.ibGibs.length === 0) {
                 // If we don't have it, we put it in `deltaReqAddrs` of the Ack.
                 deltaReqAddrs.push(addr);
@@ -638,7 +765,7 @@ export class SyncSagaCoordinator {
         for (const tjp of remoteTjps) {
             const localAddr = localKV[tjp];
             if (localAddr) {
-                const res = await getFromSpace({ addr: localAddr, space });
+                const res = await getFromSpace({ addr: localAddr, space: destSpace });
                 if (res.success && res.ibGibs?.[0]) {
                     const ibGib = res.ibGibs[0];
                     const realTjp = ibGib.rel8ns?.tjp?.[0] || getIbGibAddr({ ibGib }); // Should match `tjp` if normalized 
@@ -655,7 +782,7 @@ export class SyncSagaCoordinator {
             // We can't really know if it's covered easily without resolving. 
             // But if we don't have it (requesting), we won't find it here anyway.
             // If we DO have it (push offer), we might find it.
-            const res = await getFromSpace({ addr, space });
+            const res = await getFromSpace({ addr, space: destSpace });
             if (res.success && res.ibGibs?.[0]) {
                 const ibGib = res.ibGibs[0];
                 const tjpAddr = ibGib.rel8ns?.tjp?.[0] || getIbGibAddr({ ibGib });
@@ -675,24 +802,7 @@ export class SyncSagaCoordinator {
         // 2. Receiver says "I don't have X. But if I did have Y (ancestor), I'd tell you." 
         // Problem: Receiver doesn't know X is related to Y without X.
         // SOLUTION:
-        // The *Sender* must include TJP/Past info in `Init`? Or `pushOfferAddrs` should be richer?
-        // OR: Receiver does a check.
-        // Wait, if Sender sends V2, it's just an address.
-        // If Receiver doesn't have it, it's opaque.
-        // REVISIT "Constant / No TJP" logic:
-        // IF we are testing "Sender Newer", meaning Sender has V2, Receiver has V1.
-        // Sender calls `sync([V2])`. Init Frame contains `stones: [V2_Address]`.
-        // Receiver checks V2_Address. Not found.
-        // Receiver requests V2.
-        // Receiver sends Ack(DeltaReq: [V2], Knowledge: {}).
-        // Sender receives Ack. Sender sends V2 *AND* its deps (V1, Root).
-        // Receiver has V1. Sender sends V1 anyway.
-        // This is "Naive Deep Sync".
-        // TO ACHIEVE "Smart Diff":
-        // Receiver needs to know "Oh, V2 is a timeline tip of TJP_A".
-        // If Sender doesn't send TJP info, Receiver is blind.
-        // Proposed Fix (Short Term):
-        // `SyncInitData` should include TJP mappings or we rely on `knowledgeVector` in `Init`?
+        // The *Sender* must include TJP mappings or we rely on `knowledgeVector` in `Init`?
         // `SyncSagaMessageInitData_V1` extends `SyncInitData`.
         // `SyncInitData` has `knowledgeVector`.
         // If Sender populates `knowledgeVector` in `Init`, Receiver can use keys (TJPs) to look up its own state!
@@ -707,10 +817,11 @@ export class SyncSagaCoordinator {
             deltaReqAddrs,
             pushOfferAddrs,
             knowledgeVector,
+            conflicts: conflicts.length > 0 ? conflicts : undefined, // Include conflicts if any detected
         };
         const ackStone = await this.createSyncMsgStone({
             data: ackData,
-            space,
+            space: tempSpace,
             metaspace,
         });
         if (logalot) {
@@ -721,12 +832,12 @@ export class SyncSagaCoordinator {
             prevSagaIbGib: sagaIbGib,
             msgStones: [ackStone],
             identity,
-            space,
+            space: tempSpace,
             metaspace,
         });
-        if (logalot) {
-            console.log(`${lc} ackFrame created: ${pretty(ackFrame)} (I: be24480592eec478086bb3da49286826)`);
-        }
+        // IMMEDIATELY persist to both spaces for audit trail (before any errors can occur)
+        await this.ensureSagaFrameInBothSpaces({ frame: ackFrame, destSpace, tempSpace, metaspace });
+        // if (logalot) { console.log(`${lc} ackFrame created: ${pretty(ackFrame)} (I: be24480592eec478086bb3da49286826)`); }
         return { frame: ackFrame };
     }
     /**
@@ -741,119 +852,318 @@ export class SyncSagaCoordinator {
      *
      * Returns a `Delta` frame.
      */
-    async handleAckFrame({ sagaIbGib, srcGraph, space, metaspace, identity, }) {
+    async handleAckFrame({ sagaIbGib, srcGraph, destSpace, tempSpace, metaspace, identity, }) {
         const lc = `${this.lc}[${this.handleAckFrame.name}]`;
-        if (logalot) {
-            console.log(`${lc} starting...`);
-        }
-        const { messageData, } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space });
-        const ackData = messageData;
-        if (!ackData) {
-            throw new Error(`${lc} ackData falsy (E: 3b8415edc876084c88a25b98e2d55826)`);
-        }
-        if (ackData.stage !== SyncStage.ack) {
-            throw new Error(`${lc} Invalid ack frame: ackData.stage !== SyncStage.ack (E: 2e8b0a94b5954a66a6a1a7a0b3f5b7a1)`);
-        }
-        const deltaReqAddrs = ackData.deltaReqAddrs || [];
-        const pushOfferAddrs = ackData.pushOfferAddrs || [];
-        // 1. Process Push Offers (Pull Requests) (Naive: Accept all if missing)
-        const pullReqAddrs = [];
-        for (const addr of pushOfferAddrs) {
-            const existing = srcGraph[addr] || (await getFromSpace({ addr, space })).ibGibs?.[0];
-            if (!existing) {
-                pullReqAddrs.push(addr);
-            }
-        }
-        // 2. Process Delta Requests (Push Payload)
-        // [NEW] Smart Diff: Use knowledgeVector to skip dependencies
-        const skipAddrs = new Set();
-        if (ackData.knowledgeVector) {
-            Object.values(ackData.knowledgeVector).forEach(addrs => {
-                addrs.forEach(a => skipAddrs.add(a));
-            });
-        }
-        const payloadIbGibs = [];
-        // Gather all tips to sync first
-        const tipsToSync = [];
-        for (const addr of deltaReqAddrs) {
-            let ibGib = srcGraph[addr];
-            if (!ibGib) {
-                const res = await getFromSpace({ addr, space });
-                if (res.ibGibs && res.ibGibs.length > 0) {
-                    ibGib = res.ibGibs[0];
-                }
+        try {
+            if (logalot) {
+                console.log(`${lc} starting... (I: 605b6860e898267a5b50c6d85704be26)`);
             }
-            if (ibGib) {
-                tipsToSync.push(ibGib);
+            const { messageData, } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space: tempSpace });
+            const ackData = messageData;
+            if (!ackData) {
+                throw new Error(`${lc} ackData falsy (E: 3b8415edc876084c88a25b98e2d55826)`);
             }
-            else {
-                throw new Error(`${lc} Requested addr not found: ${addr} (E: d41d59cff4a887f6414c3e92eabd8e26)`);
+            if (ackData.stage !== SyncStage.ack) {
+                throw new Error(`${lc} Invalid ack frame: ackData.stage !== SyncStage.ack (E: 2e8b0a94b5954a66a6a1a7a0b3f5b7a1)`);
             }
-        }
-        // Calculate Dependency Graph for ALL tips, effectively utilizing common history
-        // Pass skipAddrs to `getDependencyGraph` or gather manually.
-        // `getDependencyGraph` takes a single ibGib.
-        // We can optimize by doing it for each tip and unioning the result? 
-        // Or `graph-helper` could support `ibGibs: []`. It currently takes `ibGib`.
-        // We will loop.
-        const allDepsSet = new Set();
-        for (const tip of tipsToSync) {
-            // Always include the tip itself
-            const tipAddr = getIbGibAddr({ ibGib: tip });
-            // Only process if not skipped (though deltaReq implies they barely just asked for it)
-            // But detailed deps might be skipped.
-            // Get Graph with Skips
-            // Logic: "Give me everything related to Tip, EXCEPT X, Y, Z"
-            const deps = await getDependencyGraph({
-                ibGib: tip,
-                space,
-                skipAddrs: Array.from(skipAddrs)
-            });
-            // [FIX] Ensure Tip is included if not in deps (e.g. constant with no rel8ns)
-            let tipIncluded = false;
-            if (deps) {
-                Object.values(deps).forEach(d => {
-                    const dAddr = getIbGibAddr({ ibGib: d });
-                    if (!allDepsSet.has(dAddr)) {
-                        allDepsSet.add(dAddr);
-                        payloadIbGibs.push(d);
+            if (logalot) {
+                console.log(`${lc} ackData: ${pretty(ackData)} (I: 7f8e9d0a1b2c3d4e5f6g7h8i9j0k)`);
+            }
+            // 1. Check for Conflicts
+            const conflicts = ackData.conflicts || [];
+            console.log(`${lc} [CONFLICT DEBUG] Received conflicts from Ack: ${conflicts.length}`);
+            if (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)}`);
+                // 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: a1b2c3d4e5f6g7h8i9j0k)`);
+            }
+            const optimisticConflicts = conflicts.filter(c => !c.terminal);
+            const mergeDeltaReqs = []; // Additional requests for merging
+            if (optimisticConflicts.length > 0) {
+                console.log(`${lc} [CONFLICT DEBUG] Processing ${optimisticConflicts.length} optimistic conflicts`);
+                // We need to resolve these.
+                // Strategy:
+                // 1. Analyze Divergence (Sender vs Receiver)
+                // 2. Identify missing data needed for merge (Receiver's unique frames)
+                // 3. Request that data (as Delta Reqs)
+                // 4. (Later in Delta Phase) Perform Merge.
+                // BUT: The Delta Phase is usually generic "Send me these Addrs".
+                // If we just add to `deltaReqAddrs` (which are requests for Sender to send to Receiver?),
+                // wait. `ackData.deltaReqAddrs` are what RECEIVER wants from SENDER.
+                // We (Sender) are processing the Ack.
+                // We need to request data FROM Receiver.
+                // But the protocol 'Ack' step typically leads to 'Delta' (Sender sending data).
+                // If Sender needs data from Receiver, it usually happens in 'Pull' mode or a separate request?
+                // Or can we send a 'Delta Request' frame?
+                // Standard Saga: Init(Push) -> Ack(Pull Reqs) -> Delta(Push Data).
+                // If Sender needs data, we might need a "Reverse Delta" or "Pull" phase?
+                // Or we just proceed to Delta (sending what Receiver wants), 
+                // AND we piggyback our own requests?
+                // OR: We treat the Conflict Resolution as a sub-saga or side-effect?
+                // SIMPLIFICATION for V1:
+                // If we need data to merge, we must get it.
+                // We are the Coordinator (Active). We can fetch from Peer immediately?
+                // `peer.pull(addr)`?
+                // Yes! The Coordinator has the `peer`.
+                // Let's analyze and pull immediately.
+                for (const conflict of optimisticConflicts) {
+                    const { timelineAddrs, localAddr: receiverTip, remoteAddr: senderTip } = conflict;
+                    // Sender History
+                    // We need our own history for this timeline.
+                    // We know the 'senderTip' (remoteAddr in Ack).
+                    // Sender should verify it has this tip.
+                    // Compute Diffs
+                    // We need to find `receiverOnly` addrs.
+                    // Receiver sent us `timelineAddrs` (Full History).
+                    const receiverHistorySet = new Set(timelineAddrs);
+                    // We need our execution context's history for this senderTip.
+                    // We can fetch valid 'past' from space.
+                    const resSenderTip = await getFromSpace({ space: destSpace, addr: senderTip });
+                    const senderTipIbGib = resSenderTip.ibGibs?.[0];
+                    if (!senderTipIbGib) {
+                        throw new Error(`${lc} Sender missing its own tip? ${senderTip} (E: 9c8d7e6f5g4h3i2j1k0l)`);
                     }
-                    if (dAddr === tipAddr) {
-                        tipIncluded = true;
+                    // Basic Diff: Find what Receiver has that we don't.
+                    // Actually, we need to traverse OUR past to find commonality.
+                    const senderHistory = [senderTip, ...(senderTipIbGib.rel8ns?.past || [])];
+                    const receiverOnlyAddrs = timelineAddrs.filter(addr => !senderHistory.includes(addr));
+                    if (receiverOnlyAddrs.length > 0) {
+                        console.log(`${lc} [CONFLICT DEBUG] Found ${receiverOnlyAddrs.length} receiver-only frames - need to pull for merge`);
+                        console.log(`${lc} [CONFLICT DEBUG] Receiver-only addrs:`, receiverOnlyAddrs);
+                        // PULL these frames from Peer into Local Space
+                        // (Validation: We trust peer for now / verification happens on put)
+                        for (const addr of receiverOnlyAddrs) {
+                            // This 'pull' is a sync-peer method?
+                            // The Coordinator 'peer' passed in 'sync()' might be needed here?
+                            // Wait, `handleAckFrame` doesn't have reference to `peer`?
+                            // It only has `space`, `metaspace`.
+                            // The `peer` is held by the `executeSagaLoop`.
+                            // PROBLEM: `handleAckFrame` is pure logic on the Space/Data?
+                            // No, it's a method on Coordinator. 
+                            // But `executeSagaLoop` calls it.
+                            // We might need to return "Requirements" to the loop?
+                            // Checking return type: `{ frame: SyncIbGib_V1, payloadIbGibs?: ... }`
+                            // It returns the NEXT frame (Delta).
+                            // If we need to fetch data, we are blocked.
+                            // We can't easily "Pull" here without the Peer reference.
+                            // OPTION A: Pass `peer` to `handleAckFrame`.
+                            // OPTION B: Return a strict list of "MissingDeps" and let Loop handle it.
+                            // Let's assume we can resolve this by adding `peer` to signature or using `metaspace` if it's a peer-witness?
+                            // No, Peer is ephemeral connection.
+                            // Let's add `peer` to `handleAckFrame` signature?
+                            // It breaks the pattern of just handling frame + space.
+                            // ALTERNATIVE: Use the `Delta` frame to request data?
+                            // `SyncSagaMessageDeltaData` has `requests?: string[]`.
+                            // Sender sends Delta Frame.
+                            // Does Receiver handle Delta Requests?
+                            // `handleDeltaFrame` (Receiver) -> checks `requests`.
+                            // YES.
+                            // So Sender puts `receiverOnlyAddrs` into `deltaFrame.requests`.
+                            // Receiver sees them, fetches them, and includes them in the Response (Commit?).
+                            // Wait, Init->Ack->Delta->Commit.
+                            // If Receiver sends data in Commit, that's "too late" for Sender to Merge in THIS saga round?
+                            // Unless Commit is not the end?
+                            // Or we do a "Delta 2" loop?
+                            // "Iterative Resolution Loop" from plan.
+                            // If we request data in Delta, Receiver sends it in Commit (or Delta-Response).
+                            // Sender gets Commit. Sees data. Merges.
+                            // Then Sender needs to Send the MERGE result.
+                            // Needs another Push/Delta.
+                            // REFINED FLOW:
+                            // 1. Sender sends Delta Frame with `requests: [receiverOnlyAddrs]`.
+                            // 2. Receiver responds (Commit? or Ack 2?) with Payload (Divergent Frames).
+                            // 3. Sender handles response -> Merges.
+                            // 4. Sender sends Commit (containing Merge Frame).
+                            // Issue: Current state machine is Init->Ack->Delta->Commit.
+                            // We need to keep Saga open.
+                            // If Sender sends Delta with requests, does it transition to Commit?
+                        }
+                        // Compute DELTA dependencies for each receiver-only frame
+                        // Find LCA to determine what dependencies we already have
+                        const lcaAddr = timelineAddrs.find(addr => senderHistory.includes(addr));
+                        console.log(`${lc} [CONFLICT DEBUG] LCA: ${lcaAddr || 'NONE'}`);
+                        const skipAddrsSet = new Set();
+                        if (lcaAddr) {
+                            try {
+                                const lcaRes = await getFromSpace({ addr: lcaAddr, space: destSpace });
+                                const lcaIbGib = lcaRes.ibGibs?.[0];
+                                if (lcaIbGib) {
+                                    const lcaDeps = await getDependencyGraph({ ibGib: lcaIbGib, space: destSpace });
+                                    if (lcaDeps)
+                                        Object.keys(lcaDeps).forEach(a => skipAddrsSet.add(a));
+                                    console.log(`${lc} [CONFLICT DEBUG] LCA deps to skip: ${skipAddrsSet.size}`);
+                                }
+                            }
+                            catch (e) {
+                                console.warn(`${lc} Error getting LCA deps: ${extractErrorMsg(e)}`);
+                            }
+                        }
+                        // For each receiver-only frame, get its DELTA dependency graph (minus LCA deps)
+                        for (const addr of receiverOnlyAddrs) {
+                            // Add the frame itself first
+                            if (!mergeDeltaReqs.includes(addr)) {
+                                mergeDeltaReqs.push(addr);
+                            }
+                            // Get the frame's delta dependencies (skip LCA's deps)
+                            try {
+                                const frameRes = await getFromSpace({ addr, space: destSpace });
+                                const frameIbGib = frameRes.ibGibs?.[0];
+                                if (frameIbGib) {
+                                    // Get dependency graph, skipping all LCA dependencies
+                                    const frameDeltaDeps = await getDependencyGraph({
+                                        ibGib: frameIbGib,
+                                        space: destSpace,
+                                        skipAddrs: Array.from(skipAddrsSet), // Skip entire LCA dep graph
+                                    });
+                                    if (frameDeltaDeps) {
+                                        // Add all delta dependencies (Object.keys gives us the addresses)
+                                        Object.keys(frameDeltaDeps).forEach(depAddr => {
+                                            if (!mergeDeltaReqs.includes(depAddr) && !skipAddrsSet.has(depAddr)) {
+                                                mergeDeltaReqs.push(depAddr);
+                                            }
+                                        });
+                                    }
+                                }
+                            }
+                            catch (depError) {
+                                console.warn(`${lc} [CONFLICT DEBUG] Error getting delta deps for ${addr}: ${extractErrorMsg(depError)}`);
+                            }
+                        }
+                        console.log(`${lc} [CONFLICT DEBUG] Total merge requests (frames + delta deps): ${mergeDeltaReqs.length}`);
                     }
+                    else {
+                        console.log(`${lc} [CONFLICT DEBUG] No receiver-only frames found for this conflict`);
+                    }
+                }
+                console.log(`${lc} [CONFLICT DEBUG] Finished processing ${optimisticConflicts.length} conflicts. mergeDeltaReqs: ${mergeDeltaReqs.length}`);
+            }
+            else {
+                console.log(`${lc} [CONFLICT DEBUG] No optimistic conflicts to process`);
+            }
+            // 2. Prepare Delta Payload (What Receiver Requesting + Our Conflict Logic)
+            const deltaReqAddrs = ackData.deltaReqAddrs || [];
+            const pushOfferAddrs = ackData.pushOfferAddrs || [];
+            // 1. Process Push Offers (Pull Requests) (Naive: Accept all if missing)
+            const pullReqAddrs = [];
+            for (const addr of pushOfferAddrs) {
+                const existing = srcGraph[addr] || (await getFromSpace({ addr, space: destSpace })).ibGibs?.[0];
+                if (!existing) {
+                    pullReqAddrs.push(addr);
+                }
+            }
+            // 2. Process Delta Requests (Push Payload)
+            // [NEW] Smart Diff: Use knowledgeVector to skip dependencies
+            const skipAddrs = new Set();
+            if (ackData.knowledgeVector) {
+                Object.values(ackData.knowledgeVector).forEach(addrs => {
+                    addrs.forEach(a => skipAddrs.add(a));
                 });
             }
-            if (!tipIncluded && !skipAddrs.has(tipAddr)) {
-                if (logalot) {
-                    console.log(`${lc} Tip not in deps, adding explicitly: ${tipAddr}`);
+            const payloadIbGibs = [];
+            // Gather all tips to sync first
+            const tipsToSync = [];
+            for (const addr of deltaReqAddrs) {
+                let ibGib = srcGraph[addr];
+                if (!ibGib) {
+                    const res = await getFromSpace({ addr, space: destSpace });
+                    if (res.ibGibs && res.ibGibs.length > 0) {
+                        ibGib = res.ibGibs[0];
+                    }
+                }
+                if (ibGib) {
+                    tipsToSync.push(ibGib);
+                }
+                else {
+                    throw new Error(`${lc} Requested addr not found: ${addr} (E: d41d59cff4a887f6414c3e92eabd8e26)`);
+                }
+            }
+            // Calculate Dependency Graph for ALL tips, effectively utilizing common history
+            // Pass skipAddrs to `getDependencyGraph` or gather manually.
+            // `getDependencyGraph` takes a single ibGib.
+            // We can optimize by doing it for each tip and unioning the result? 
+            // Or `graph-helper` could support `ibGibs: []`. It currently takes `ibGib`.
+            // We will loop.
+            const allDepsSet = new Set();
+            for (const tip of tipsToSync) {
+                // Always include the tip itself
+                const tipAddr = getIbGibAddr({ ibGib: tip });
+                // Only process if not skipped (though deltaReq implies they barely just asked for it)
+                // But detailed deps might be skipped.
+                // Get Graph with Skips
+                // Logic: "Give me everything related to Tip, EXCEPT X, Y, Z"
+                const deps = await getDependencyGraph({
+                    ibGib: tip,
+                    space: destSpace,
+                    skipAddrs: Array.from(skipAddrs)
+                });
+                // [FIX] Ensure Tip is included if not in deps (e.g. constant with no rel8ns)
+                let tipIncluded = false;
+                if (deps) {
+                    Object.values(deps).forEach(d => {
+                        const dAddr = getIbGibAddr({ ibGib: d });
+                        if (!allDepsSet.has(dAddr)) {
+                            allDepsSet.add(dAddr);
+                            payloadIbGibs.push(d);
+                        }
+                        if (dAddr === tipAddr) {
+                            tipIncluded = true;
+                        }
+                    });
                 }
-                if (!allDepsSet.has(tipAddr)) {
-                    allDepsSet.add(tipAddr);
-                    payloadIbGibs.push(tip);
+                if (!tipIncluded && !skipAddrs.has(tipAddr)) {
+                    if (logalot) {
+                        console.log(`${lc} Tip not in deps, adding explicitly: ${tipAddr}`);
+                    }
+                    if (!allDepsSet.has(tipAddr)) {
+                        allDepsSet.add(tipAddr);
+                        payloadIbGibs.push(tip);
+                    }
                 }
             }
+            // 3. Create Delta Frame
+            const sagaId = ackData.sagaId;
+            const deltaData = {
+                sagaId: sagaIbGib.data.uuid,
+                stage: SyncStage.delta,
+                payloadAddrs: payloadIbGibs.map(p => getIbGibAddr({ ibGib: p })),
+                requests: [...(pullReqAddrs || []), ...(mergeDeltaReqs || [])].length > 0 ? [...(pullReqAddrs || []), ...(mergeDeltaReqs || [])] : undefined,
+            };
+            if (logalot) {
+                console.log(`${lc} Creating Delta Stone. Data stage: ${deltaData.stage}`);
+            }
+            const deltaStone = await this.createSyncMsgStone({
+                data: deltaData,
+                space: tempSpace,
+                metaspace,
+            });
+            const deltaFrame = await this.evolveSyncSagaIbGib({
+                prevSagaIbGib: sagaIbGib,
+                msgStones: [deltaStone],
+                identity,
+                space: tempSpace,
+                metaspace,
+            });
+            // IMMEDIATELY persist to both spaces for audit trail
+            await this.ensureSagaFrameInBothSpaces({ frame: deltaFrame, destSpace, tempSpace, metaspace });
+            if (logalot) {
+                console.log(`${lc} Delta Frame created. Rel8ns: ${JSON.stringify(deltaFrame.rel8ns)}`);
+            }
+            return { frame: deltaFrame, payloadIbGibs };
+        }
+        catch (error) {
+            console.error(`${lc} ${extractErrorMsg(error)}`);
+            throw error;
+        }
+        finally {
+            if (logalot) {
+                console.log(`${lc} complete.`);
+            }
         }
-        // 3. Create Delta Frame
-        const sagaId = ackData.sagaId;
-        const deltaData = {
-            sagaId,
-            stage: SyncStage.delta,
-            payloadAddrs: payloadIbGibs.map(p => getIbGibAddr({ ibGib: p })),
-            requests: pullReqAddrs.length > 0 ? pullReqAddrs : undefined,
-        };
-        const deltaStone = await this.createSyncMsgStone({
-            data: deltaData,
-            space,
-            metaspace,
-        });
-        const deltaFrame = await this.evolveSyncSagaIbGib({
-            prevSagaIbGib: sagaIbGib,
-            msgStones: [deltaStone],
-            identity,
-            space,
-            metaspace,
-        });
-        return { frame: deltaFrame, payloadIbGibs };
     }
     /**
      * Handles the `Delta` frame.
@@ -865,12 +1175,12 @@ 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`.
      */
-    async handleDeltaFrame({ sagaIbGib, srcGraph, space, metaspace, identity, }) {
+    async handleDeltaFrame({ sagaIbGib, srcGraph, destSpace, tempSpace, metaspace, identity, }) {
         const lc = `${this.lc}[${this.handleDeltaFrame.name}]`;
         if (logalot) {
             console.log(`${lc} starting...`);
         }
-        const { messageData } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space });
+        const { messageData } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space: tempSpace });
         const deltaData = messageData;
         if (!deltaData) {
             throw new Error(`${lc} deltaData falsy (E: 7c28c8d8f08a4421b8344e6727271421)`);
@@ -878,116 +1188,363 @@ export class SyncSagaCoordinator {
         if (deltaData.stage !== SyncStage.delta) {
             throw new Error(`${lc} Invalid delta frame: deltaData.stage !== SyncStage.delta (E: 0c28c8d8f08a4421b8344e6727271421)`);
         }
+        if (logalot) {
+            console.log(`${lc} deltaData: ${pretty(deltaData)} (I: 8d7e6f5g4h3i2j1k0l9m)`);
+        }
+        console.log(`${lc} [CONFLICT DEBUG] deltaData.payloadAddrs count: ${deltaData.payloadAddrs?.length || 0}`);
         const payloadAddrs = deltaData.payloadAddrs || [];
-        const requests = deltaData.requests || [];
-        // 1. Process Received Payload
+        const peerRequests = deltaData.requests || [];
+        const peerProposesCommit = deltaData.proposeCommit || false;
+        // 1. Process Received Payload (Ingest)
         const receivedPayloadIbGibs = [];
         if (payloadAddrs.length > 0) {
+            // We use `payloadAddrs` as the manifest. 
+            // The ACTUAL collection of ibGibs should be available via `getFromSpace` 
+            // assuming the "Transport" layer put them there implicitly?
+            // OR, if we are local-only, we just get them.
+            // The `handleDeltaFrame` contract assumes data is reachable in `space`.
             const res = await getFromSpace({
                 addrs: payloadAddrs,
-                space,
+                space: tempSpace, // Incoming data is in tempSpace
             });
             if (res.ibGibs) {
                 receivedPayloadIbGibs.push(...res.ibGibs);
+                // Also put them? `getFromSpace` retrieves. If they are in space, they are persisted.
+                // If this is a Temp Space, they are safe.
+            }
+            else {
+                console.warn(`${lc} Failed to retrieve payloads listed in delta: ${payloadAddrs.join(', ')}`);
             }
         }
-        // 2. Fulfill Requests (Outgoing Payload)
+        // 2. Fulfill Peer Requests (Outgoing Payload with Delta Dependencies)
         const outgoingPayload = [];
-        for (const addr of requests) {
+        const outgoingAddrsSet = new Set(); // Track what we've added
+        console.log(`${lc} [CONFLICT DEBUG] Fulfilling ${peerRequests.length} peer requests`);
+        for (const addr of peerRequests) {
+            // Get the requested ibGib
             let ibGib = srcGraph[addr];
             if (!ibGib) {
-                const res = await getFromSpace({ addr, space });
+                const res = await getFromSpace({ addr, space: destSpace }); // Query from destSpace  
                 if (res.ibGibs && res.ibGibs.length > 0) {
                     ibGib = res.ibGibs[0];
                 }
             }
             if (ibGib) {
-                outgoingPayload.push(ibGib);
+                // Add the requested ibGib itself
+                const ibGibAddr = getIbGibAddr({ ibGib });
+                if (!outgoingAddrsSet.has(ibGibAddr)) {
+                    outgoingPayload.push(ibGib);
+                    outgoingAddrsSet.add(ibGibAddr);
+                }
+                // Expand to include full dependency graph for this ibGib
+                // (Receiver needs all deps to properly process/merge)
+                try {
+                    const deps = await getDependencyGraph({
+                        ibGib,
+                        space: destSpace,
+                    });
+                    if (deps) {
+                        Object.values(deps).forEach(depIbGib => {
+                            const depAddr = getIbGibAddr({ ibGib: depIbGib });
+                            if (!outgoingAddrsSet.has(depAddr)) {
+                                outgoingPayload.push(depIbGib);
+                                outgoingAddrsSet.add(depAddr);
+                            }
+                        });
+                    }
+                }
+                catch (depError) {
+                    console.warn(`${lc} [CONFLICT DEBUG] Error expanding deps for ${addr}: ${extractErrorMsg(depError)}`);
+                }
+            }
+            else {
+                console.warn(`${lc} Requested addr not found during delta fulfillment: ${addr}`);
             }
         }
-        // 3. Determine Next Stage
-        if (requests.length > 0) {
-            // They requested more data -> Send Delta
-            const sagaId = deltaData.sagaId;
+        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.
+        // We look at the Saga History (Ack Frame) to find conflicts.
+        // Optimization: Do this only if we received payloads.
+        const mergeResultIbGibs = [];
+        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...`);
+            // 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;
+            if (pastAddrs.length > 0) {
+                // Batch fetch all past frames
+                const resPast = await getFromSpace({ addrs: pastAddrs, space: tempSpace });
+                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: tempSpace
+                        });
+                        if (messageStone?.data?.stage === SyncStage.ack) {
+                            ackData = messageStone.data;
+                            console.log(`${lc} [TEST DEBUG] Found Ack Frame. Conflicts: ${ackData.conflicts?.length || 0}`);
+                            break;
+                        }
+                    }
+                }
+            }
+            if (ackData && ackData.conflicts) {
+                const optimisticConflicts = ackData.conflicts.filter(c => !c.terminal);
+                for (const conflict of optimisticConflicts) {
+                    const { timelineAddrs, localAddr: receiverTip, remoteAddr: senderTip } = conflict;
+                    // We are Sender (usually) here if we are merging.
+                    // Check if we have the history needed (timelineAddrs).
+                    // Specifically, we needed the `receiverOnly` parts.
+                    // We blindly attempt merge if we have both tips accessible?
+                    // 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}`);
+                    const resRecTip = await getFromSpace({ addr: receiverTip, space: tempSpace }); // Check tempSpace for incoming data
+                    console.log(`${lc} [CONFLICT DEBUG] ReceiverTip found in tempSpace: ${!!resRecTip.ibGibs?.[0]}`);
+                    if (resRecTip.success && resRecTip.ibGibs?.[0]) {
+                        // We have the tip!
+                        // Do we have the full history? 
+                        // `mergeDivergentTimelines` in `conflict-optimistic` will attempt to fetch history.
+                        // If we just ingested the missing pieces, `getFromSpace` inside `merge` should succeed.
+                        // Perform Merge!
+                        try {
+                            const mergeResult = await mergeDivergentTimelines({
+                                tipA: (await getFromSpace({ addr: senderTip, space: destSpace })).ibGibs[0], // Our tip from destSpace
+                                tipB: resRecTip.ibGibs[0], // Their tip (from tempSpace)
+                                space: tempSpace, // Merge uses tempSpace
+                                metaspace,
+                            });
+                            if (mergeResult) {
+                                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}`);
+                            // If merge fails, we might Abort or just continue?
+                        }
+                    }
+                }
+            }
+        }
+        // 4. Determine Next Action
+        // We have `outgoingPayload` (Requests + Merge Results).
+        // Does Peer have outstanding requests? No, we fulfilled `peerRequests`.
+        // Do WE have outstanding requests?
+        // We might if `mergeResult` requires further sync? Usually no, result is complete.
+        const myRequests = []; // If we had more needs (e.g. partial payload), we'd add here.
+        const hasOutgoing = outgoingPayload.length > 0;
+        const hasMyRequests = myRequests.length > 0;
+        if (hasOutgoing || hasMyRequests) {
+            // We have business to attend to -> Send Delta
             const responseDeltaData = {
-                sagaId,
+                sagaId: deltaData.sagaId,
                 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,
-                space,
+                space: tempSpace,
                 metaspace
             });
             const deltaFrame = await this.evolveSyncSagaIbGib({
                 prevSagaIbGib: sagaIbGib,
                 msgStones: [deltaStone],
                 identity,
-                space,
+                space: tempSpace,
                 metaspace
             });
+            // IMMEDIATELY persist to both spaces for audit trail
+            await this.ensureSagaFrameInBothSpaces({ frame: deltaFrame, destSpace, tempSpace, metaspace });
             return { frame: deltaFrame, payloadIbGibs: outgoingPayload, receivedPayloadIbGibs };
         }
         else {
-            // No requests -> Commit
-            const sagaId = deltaData.sagaId;
-            const commitData = {
-                sagaId,
-                stage: SyncStage.commit,
-                success: true,
-            };
-            const commitStone = await this.createSyncMsgStone({
-                data: commitData,
-                space,
-                metaspace
-            });
-            const commitFrame = await this.evolveSyncSagaIbGib({
-                prevSagaIbGib: sagaIbGib,
-                msgStones: [commitStone],
-                identity,
-                space,
-                metaspace
-            });
-            return { frame: commitFrame, receivedPayloadIbGibs };
+            // We have nothing to send.
+            if (peerProposesCommit) {
+                // Peer is done. We are done. -> Commit.
+                const commitData = {
+                    sagaId: deltaData.sagaId,
+                    stage: SyncStage.commit,
+                    success: true,
+                };
+                const commitStone = await this.createSyncMsgStone({
+                    data: commitData,
+                    space: tempSpace,
+                    metaspace
+                });
+                const commitFrame = await this.evolveSyncSagaIbGib({
+                    prevSagaIbGib: sagaIbGib,
+                    msgStones: [commitStone],
+                    identity,
+                    space: tempSpace,
+                    metaspace
+                });
+                // IMMEDIATELY persist to both spaces for audit trail
+                await this.ensureSagaFrameInBothSpaces({ frame: commitFrame, destSpace, tempSpace, metaspace });
+                return { frame: commitFrame, receivedPayloadIbGibs };
+            }
+            else {
+                // peer did NOT propose commit (maybe they just sent data/requests and didn't ready flag).
+                // But we are empty.
+                // So WE propose commit.
+                const responseDeltaData = {
+                    sagaId: deltaData.sagaId,
+                    stage: SyncStage.delta,
+                    proposeCommit: true,
+                    payloadAddrs: [], // Always include empty array if sending delta
+                };
+                const deltaStone = await this.createSyncMsgStone({
+                    data: responseDeltaData,
+                    space: tempSpace,
+                    metaspace
+                });
+                const deltaFrame = await this.evolveSyncSagaIbGib({
+                    prevSagaIbGib: sagaIbGib,
+                    msgStones: [deltaStone],
+                    identity,
+                    space: tempSpace,
+                    metaspace
+                });
+                // IMMEDIATELY persist to both spaces for audit trail
+                await this.ensureSagaFrameInBothSpaces({ frame: deltaFrame, destSpace, tempSpace, metaspace });
+                // Check if PEER proposed commit
+                if (deltaData.proposeCommit) {
+                    if (logalot) {
+                        console.log(`${lc} Peer proposed commit. Accepting & Committing.`);
+                    }
+                    // Peer wants to commit and has no more requests.
+                    // We should Commit.
+                    const commitData = {
+                        sagaId: deltaData.sagaId,
+                        stage: SyncStage.commit,
+                        success: true,
+                    };
+                    const commitStone = await this.createSyncMsgStone({
+                        data: commitData,
+                        space: tempSpace,
+                        metaspace
+                    });
+                    const commitFrame = await this.evolveSyncSagaIbGib({
+                        prevSagaIbGib: deltaFrame, // Build on top of the Delta we just created/persisted
+                        msgStones: [commitStone],
+                        identity,
+                        space: tempSpace,
+                        metaspace
+                    });
+                    // IMMEDIATELY persist to both spaces for audit trail
+                    await this.ensureSagaFrameInBothSpaces({ frame: commitFrame, destSpace, tempSpace, metaspace });
+                    return { frame: commitFrame, receivedPayloadIbGibs };
+                }
+                return { frame: deltaFrame, receivedPayloadIbGibs };
+            }
         }
     }
-    async handleCommitFrame({ sagaIbGib, space, }) {
+    async handleCommitFrame({ sagaIbGib, destSpace, tempSpace, metaspace, identity, }) {
         const lc = `${this.lc}[${this.handleCommitFrame.name}]`;
         if (logalot) {
-            console.log(`${lc} Commit received. Saga complete.`);
+            console.log(`${lc} Commit received.`);
         }
-        return null;
-    }
-    async handleConflictFrame({ sagaIbGib, space, }) {
-        const lc = `${this.lc}[${this.handleConflictFrame.name}]`;
-        const { messageData } = await this.getStageAndPayloadFromFrame({ ibGib: sagaIbGib, space });
-        const conflictData = messageData;
+        // 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.
+        // Note: Currently we don't have explicit cleanup logic implemented here yet (TODO).
         if (logalot) {
-            console.log(`${lc} Conflict received. Strategy: ${conflictData?.conflictStrategy}. Terminal: ${conflictData?.isTerminal}`);
-        }
-        if (conflictData?.isTerminal) {
-            throw new Error(`${lc} Saga aborted due to conflicts: ${JSON.stringify(conflictData.conflicts)} (E: b08d1f2a3c4e5d6f7a8b9c0d1e2f3a4b)`);
+            console.log(`${lc} Peer committed. Finalizing saga locally. Saga Complete.`);
         }
-        // Non-terminal logic (stub for future)
         return null;
     }
     // #endregion Handlers
     async createSyncMsgStone({ data, space, metaspace, }) {
-        const ib = await getSyncSagaMessageIb({ data });
-        const stone = await Factory_V1.stone({
-            ib,
-            parentPrimitiveIb: SYNC_SAGA_MSG_ATOM,
-            data,
-            uuid: true, // we want the stone to have its own uniqueness
-        });
-        await putInSpace({ space, ibGib: stone });
-        await metaspace.registerNewIbGib({ ibGib: stone });
-        return stone;
+        const lc = `${this.lc}[${this.createSyncMsgStone.name}]`;
+        try {
+            if (logalot) {
+                console.log(`${lc} starting... (I: 5f7f98e8ff980364f7191fcee4531e26)`);
+            }
+            const ib = await getSyncSagaMessageIb({ data });
+            const stone = await Factory_V1.stone({
+                ib,
+                parentPrimitiveIb: SYNC_SAGA_MSG_ATOM,
+                data,
+                uuid: true, // we want the stone to have its own uniqueness
+            });
+            if (logalot) {
+                console.log(`${lc} Created stone: ${getIbGibAddr({ ibGib: stone })}`);
+            }
+            await putInSpace({ space, ibGib: stone });
+            await metaspace.registerNewIbGib({ ibGib: stone });
+            return stone;
+        }
+        catch (error) {
+            console.error(`${lc} ${extractErrorMsg(error)}`);
+            throw error;
+        }
+        finally {
+            if (logalot) {
+                console.log(`${lc} complete.`);
+            }
+        }
+    }
+    /**
+     * Ensures saga frame and its msg stone(s) are in BOTH spaces for audit trail.
+     * Control ibgibs (saga frames, msg stones, identity) must be in both destSpace and tempSpace.
+     */
+    async ensureSagaFrameInBothSpaces({ frame, destSpace, tempSpace, metaspace, }) {
+        // Frame itself (already in tempSpace from creation, need in destSpace for audit)
+        await putInSpace({ space: destSpace, ibGib: frame });
+        await metaspace.registerNewIbGib({ ibGib: frame });
+        // Msg stone(s) (already in tempSpace, need in destSpace for audit)
+        const msgStoneAddrs = frame.rel8ns?.[SYNC_MSG_REL8N_NAME];
+        if (msgStoneAddrs && msgStoneAddrs.length > 0) {
+            const resMsgStones = await getFromSpace({ space: tempSpace, addrs: msgStoneAddrs });
+            if (resMsgStones.ibGibs) {
+                for (const msgStone of resMsgStones.ibGibs) {
+                    await putInSpace({ space: destSpace, ibGib: msgStone });
+                    await metaspace.registerNewIbGib({ ibGib: msgStone });
+                }
+            }
+        }
+        // Identity (if present, already in tempSpace, need in destSpace)
+        const identityAddrs = frame.rel8ns?.identity;
+        if (identityAddrs && identityAddrs.length > 0) {
+            const resIdentity = await getFromSpace({ space: tempSpace, addrs: identityAddrs });
+            if (resIdentity.ibGibs) {
+                for (const identity of resIdentity.ibGibs) {
+                    await putInSpace({ space: destSpace, ibGib: identity });
+                    await metaspace.registerNewIbGib({ ibGib: identity });
+                }
+            }
+        }
     }
     /**
      * Evolves the saga timeline with a new frame.
      */
-    async evolveSyncSagaIbGib({ prevSagaIbGib, msgStones, identity, space, metaspace, }) {
+    async evolveSyncSagaIbGib({ prevSagaIbGib, msgStones, identity, space, metaspace, conflictStrategy, }) {
         const lc = `${this.lc}[${this.evolveSyncSagaIbGib.name}]`;
         try {
             // Validation
@@ -1058,6 +1615,7 @@ export class SyncSagaCoordinator {
                     payload: undefined, // Data in stone
                     n: 0,
                     isTjp: true,
+                    conflictStrategy,
                 };
                 const ib = await getSyncIb({ data });
                 const stoneAddrs = msgStones.map(s => getIbGibAddr({ ibGib: s }));