@ibgib/core-gib 0.1.20 → 0.1.21

package/dist/sync/sync-conflict.respec.mjs

@@ -4,9 +4,9 @@
  * Verifies Conflict Resolution strategies in SyncSagaCoordinator.
  * Reproduces divergence scenarios and asserts resolution behavior.
  */
-import { respecfully, ifWe, iReckon } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+import { respecfully, iReckon, ifWeMight } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 const maam = `[${import.meta.url}]`, sir = maam;
-import { delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { delay, extractErrorMsg, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { SyncSagaCoordinator } from './sync-saga-coordinator.mjs';
 import { getFromSpace } from '../witness/space/space-helper.mjs';
@@ -16,7 +16,10 @@ import { createTimelineRootHelper, getTestKeystoneServiceHelper } from '../agent
 import { mut8Timeline } from '../timeline/timeline-api.mjs';
 import { SyncPeerInnerspace_V1 } from './sync-peer/sync-peer-innerspace-v1.mjs';
 import { DEFAULT_INNER_SPACE_DATA_V1 } from '../witness/space/inner-space/inner-space-types.mjs';
+import { getTjpAddr } from '../common/other/ibgib-helper.mjs';
 import { SyncConflictStrategy } from './sync-types.mjs';
+import { fnObs } from '../common/pubsub/observer/observer-helper.mjs';
+import { getDependencyGraph } from '../common/other/graph-helper.mjs';
 const logalot = true;
 const lc = `[sync-conflict.respec]`;
 await respecfully(sir, `Sync Conflict Resolution`, async () => {
@@ -52,25 +55,38 @@ await respecfully(sir, `Sync Conflict Resolution`, async () => {
         await destSpace.initialized;
         // 2. Seed Common History (V0 -> V1)
         console.log(`${lc} Creating Common History...`);
-        const root = await createTimelineRootHelper({
+        const testRoot = await createTimelineRootHelper({
             ib: 'timeline_root',
-            data: { type: 'root', text: 'v0' },
+            data: { type: 'testRoot', text: 'v0' },
             space: sourceSpace,
         });
-        // Sync root to dest immediately so they start synced
-        await metaspace.put({ ibGib: root, space: destSpace });
-        await metaspace.registerNewIbGib({ ibGib: root, space: destSpace });
         // Create V1 (Common)
-        const v1_Source = await mut8Timeline({
-            timeline: root,
+        const v1_Common = await mut8Timeline({
+            timeline: testRoot,
             mut8Opts: { dataToAddOrPatch: { text: 'v1_common' } },
             metaspace,
             space: sourceSpace,
         });
-        // Sync V1 to dest
-        await metaspace.put({ ibGib: v1_Source, space: destSpace });
-        await metaspace.registerNewIbGib({ ibGib: v1_Source, space: destSpace });
-        const resGetDest = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: v1_Source }) });
+        const tjpAddr = getTjpAddr({ ibGib: testRoot, defaultIfNone: 'incomingAddr' }) ??
+            getIbGibAddr({ ibGib: testRoot });
+        console.log(`${lc} [TEST DEBUG] tjpAddr: ${tjpAddr}`);
+        // Sync testRoot to dest immediately so they start synced
+        // must get the entire dependency graph for testRoot
+        const depGraph_testRootAndV1Common = await getDependencyGraph({
+            ibGibAddrs: [tjpAddr],
+            space: sourceSpace,
+            live: true,
+        }) ?? {};
+        console.log(`${lc} depGraph_testRootAndV1Common: ${pretty(depGraph_testRootAndV1Common)}`);
+        if (Object.keys(depGraph_testRootAndV1Common).length === 0) {
+            throw new Error(`(UNEXPECTED) depGraph_testRootAndV1Common empty? (E: 39b4d855ffa65476084b4123786da826)`);
+        }
+        // put the entire graph into the destspace, but...
+        await metaspace.put({ ibGibs: Object.values(depGraph_testRootAndV1Common), space: destSpace });
+        // ...only register the main ibgibs
+        await metaspace.registerNewIbGib({ ibGib: testRoot, space: destSpace });
+        await metaspace.registerNewIbGib({ ibGib: v1_Common, space: destSpace });
+        const resGetDest = await getFromSpace({ space: destSpace, addr: getIbGibAddr({ ibGib: v1_Common }) });
         if (!resGetDest.success || !resGetDest.ibGibs || resGetDest.ibGibs.length === 0) {
             throw new Error(`Failed to retrieve v1_Dest from destSpace. (E: a1b2c3d4e5f6g7h8i9j0)`);
         }
@@ -79,7 +95,7 @@ await respecfully(sir, `Sync Conflict Resolution`, async () => {
         console.log(`${lc} Creating Divergence...`);
         // Source: V1 -> V2a (Edit Field A)
         const v2a = await mut8Timeline({
-            timeline: v1_Source,
+            timeline: v1_Common,
             mut8Opts: { dataToAddOrPatch: { fieldA: 'source_edit' } },
             metaspace,
             space: sourceSpace,
@@ -92,35 +108,57 @@ await respecfully(sir, `Sync Conflict Resolution`, async () => {
             space: destSpace,
         });
         // Verify Divergence
-        const tjpAddr = root.rel8ns.tjp[0]; // wait, root IS tjp, so no tjp rel8n...
-        // Actually root frame has isTjp: true.
-        // v1 has tjp: [v0_gib].
         console.log(`${lc} Divergence created.`);
         // 4. Run Sync (Optimistic)
         console.log(`${lc} Setting up Coordinators...`);
         const mockKeystone = await getTestKeystoneServiceHelper();
         const senderCoordinator = new SyncSagaCoordinator(mockKeystone);
         const receiverCoordinator = new SyncSagaCoordinator(mockKeystone);
+        // Create sender's tempSpace for transactional payload transfer
+        const senderTempSpaceName = `tmp_sender_test_${Date.now()}`;
+        const senderTempSpace = await metaspace.createNewLocalSpace({
+            opts: {
+                allowCancel: false,
+                spaceName: senderTempSpaceName,
+                getFnPrompt: metaspace.getFnPrompt,
+            }
+        });
+        if (!senderTempSpace) {
+            throw new Error(`(UNEXPECTED) senderTempSpace falsy? (E: ef4388c87e98f0211852eefa22414f26)`);
+        }
+        await senderTempSpace.initialized;
         const peer = new SyncPeerInnerspace_V1({
             senderSpace: sourceSpace,
+            senderTempSpace, // Pass sender's tempSpace for payload transfer
             receiverSpace: destSpace,
             receiverCoordinator,
             receiverMetaspace: metaspace,
         });
+        await peer.initialized;
         // Verify Receiver has correct KV (Pre-Sync Check)
         // This ensures the conflict precondition exists.
-        await ifWe(sir, 'verify receiver KV pre-sync', async () => {
-            const destKV = await receiverCoordinator.getKnowledgeVector({
-                space: destSpace,
-                metaspace,
-                domainIbGibs: [v1_Dest]
-            });
-            const v1TjpAddr = v1_Dest.rel8ns?.tjp?.[0] || getIbGibAddr({ ibGib: v1_Dest }); // v1 might be tjp if it was root, but here v1 is child of root
-            // Actually v1 has tjp rel8n.
-            const destTip = destKV[v1TjpAddr];
-            iReckon(sir, !!destTip).asTo(`Dest KV has timeline tip for ${v1TjpAddr}`).isGonnaBeTruthy();
-            if (!destTip) {
-                throw new Error(`Test Setup Fail: Dest Space does not have index for timeline ${v1TjpAddr}. Seeding failed. (E: 8a9b0c1d)`);
+        await ifWeMight(sir, 'verify receiver KV pre-sync', async () => {
+            try {
+                const destKV = await receiverCoordinator.getKnowledgeVector({
+                    space: destSpace,
+                    metaspace,
+                    domainIbGibs: [v1_Dest]
+                });
+                const v1TjpAddr = getTjpAddr({ ibGib: v1_Dest, defaultIfNone: 'incomingAddr' }) ?? getIbGibAddr({ ibGib: v1_Dest });
+                console.log(`[TEST DEBUG] v1_Dest: ${JSON.stringify(v1_Dest)}`);
+                console.log(`[TEST DEBUG] v1TjpAddr: ${v1TjpAddr}`);
+                console.log(`[TEST DEBUG] destKV: ${JSON.stringify(destKV)}`);
+                console.log(`[TEST DEBUG] v1_Dest.rel8ns.tjp: ${v1_Dest.rel8ns?.tjp?.join(', ')}`);
+                // Actually v1 has tjp rel8n.
+                const destTip = destKV[v1TjpAddr];
+                iReckon(sir, !!destTip).asTo(`Dest KV has timeline tip for ${v1TjpAddr}`).isGonnaBeTruthy();
+                if (!destTip) {
+                    throw new Error(`Test Setup Fail: Dest Space does not have index for timeline ${v1TjpAddr}. Seeding failed. (E: c194a80b4e4877b77826c37a1753b826)`);
+                }
+            }
+            catch (error) {
+                console.error(`${lc} ${extractErrorMsg(error)}`);
+                iReckon(sir, true).asTo('getKnowledgeVector errored out').isGonnaBeFalse();
             }
         });
         console.log(`${lc} Running Sync (ConflictStrategy: optimistic)...`);
@@ -137,6 +175,29 @@ await respecfully(sir, `Sync Conflict Resolution`, async () => {
                 // identitySecret: undefined as any,
                 // explicit useSessionIdentity: true is default
             });
+            const sublc = `${lc}[updates$]`;
+            /**
+             * I have added this so you can see how to subscribe to an ibgib
+             * observable using {@link fnObs}.
+             */
+            const subscription = await resSync.updates$.subscribe(fnObs({
+                next: async (ctxIbGib) => {
+                    console.log(`${sublc} next fired. ${pretty(ctxIbGib)}`);
+                },
+                error: async (e) => {
+                    if (e.data) {
+                        console.error(`${sublc} error fired. error: ${JSON.stringify(e.data)} (E: 01cc08ba05ad99682831174fd7c31a26)`);
+                    }
+                    else {
+                        console.dir(e);
+                        console.error(`${sublc} error fired. error: ${extractErrorMsg(e)} (E: 73d3d61464e8e4ce4cd6efd8b9675826)`);
+                    }
+                },
+                complete: async () => {
+                    console.log(`${sublc} complete fired`);
+                },
+            }));
+            console.log(`${lc} awaiting resSync.done`);
             await resSync.done;
             console.log(`${lc} Sync Complete.`);
         }
@@ -148,10 +209,68 @@ await respecfully(sir, `Sync Conflict Resolution`, async () => {
         // 5. Verification
         // Expectation: Both Spaces should now have a NEW tip (V3) that merges V2a and V2b.
         const resSourceTip = await getFromSpace({ space: sourceSpace, addr: getIbGibAddr({ ibGib: v2a }) });
-        await ifWe(sir, `verify merge happened`, async () => {
-            // We expect a new tip that is NOT v2a or v2b
-            // For now, valid failure is that this code doesn't start or completes without merge.
-            iReckon(sir, true).asTo('Merge Verification Not Yet Implemented').isGonnaBeFalse();
+        await ifWeMight(sir, `verify merge happened`, async () => {
+            // Retrieve updated KV from Source (or check what happened to v2a)
+            // Ideally, we just check the source space for the timeline tip
+            // The timeline tip for testRoot/v0 should now be NEW.
+            try {
+                // Get the KV for the Source Space
+                const sourceKV = await senderCoordinator.getKnowledgeVector({
+                    space: sourceSpace,
+                    metaspace,
+                    domainIbGibs: [testRoot] // We want to know the tip of this timeline
+                });
+                const tjpAddr = getTjpAddr({ ibGib: testRoot, defaultIfNone: 'incomingAddr' }) ??
+                    getIbGibAddr({ ibGib: testRoot });
+                if (logalot) {
+                    console.log(`${lc} getKnowledgeVector returned. sourceKV: ${pretty(sourceKV)} (I: e8780cda37c8b2a46eeb85786874e926)`);
+                }
+                const sourceTipAddr = sourceKV[tjpAddr];
+                if (!sourceTipAddr) {
+                    throw new Error(`Source Space missing timeline tip for ${tjpAddr} (E: ec95980b9c980c5c5870812e15e43826)`);
+                }
+                console.log(`${lc} [TEST DEBUG] sourceTipAddr: ${sourceTipAddr}`);
+                console.log(`${lc} [TEST DEBUG] v2a: ${getIbGibAddr({ ibGib: v2a })}`);
+                console.log(`${lc} [TEST DEBUG] v2b: ${getIbGibAddr({ ibGib: v2b })}`);
+                iReckon(sir, sourceTipAddr).asTo(`Source Tip (${sourceTipAddr}) should NOT be v2a`).not.isGonnaBe(getIbGibAddr({ ibGib: v2a }));
+                iReckon(sir, sourceTipAddr).asTo(`Source Tip (${sourceTipAddr}) should NOT be v2b`).not.isGonnaBe(getIbGibAddr({ ibGib: v2b }));
+                // Fetch the new tip
+                const resTip = await getFromSpace({ space: sourceSpace, addr: sourceTipAddr });
+                const newTip = resTip.ibGibs[0];
+                console.log(`${lc} [TEST DEBUG] newTip: ${JSON.stringify(newTip)}`);
+                // Check Data: Should have BOTH edits
+                iReckon(sir, newTip.data.fieldA).asTo('New Tip Data Field A').isGonnaBe('source_edit');
+                iReckon(sir, newTip.data.fieldB).asTo('New Tip Data Field B').isGonnaBe('dest_edit');
+                // Check Graft Structure
+                // Look for 'graftinfo' rel8n
+                const graftInfoRel = newTip.rel8ns?.graftinfo;
+                iReckon(sir, graftInfoRel).asTo('New Tip should have graftinfo rel8n').isGonnaBeTruthy();
+                if (graftInfoRel) {
+                    iReckon(sir, graftInfoRel.length).asTo('Only 1 graftinfo').isGonnaBe(1);
+                    // Fetch Graft Info Stone
+                    const resGraft = await getFromSpace({ space: sourceSpace, addr: graftInfoRel[0] });
+                    const graftInfo = resGraft.ibGibs[0];
+                    console.log(`${lc} [TEST DEBUG] graftInfo: ${JSON.stringify(graftInfo)}`);
+                    // Check Graft Relations (graftbase, graftorphan)
+                    const baseRel = graftInfo.rel8ns?.graftbase;
+                    const orphanRel = graftInfo.rel8ns?.graftorphan;
+                    iReckon(sir, baseRel).asTo('Graft Base exists').isGonnaBeTruthy();
+                    iReckon(sir, orphanRel).asTo('Graft Orphan exists').isGonnaBeTruthy();
+                    // Verify Base/Orphan identity (one should be v2a, one v2b)
+                    const addrV2a = getIbGibAddr({ ibGib: v2a });
+                    const addrV2b = getIbGibAddr({ ibGib: v2b });
+                    const bases = baseRel || [];
+                    const orphans = orphanRel || [];
+                    const isV2aInvolved = bases.includes(addrV2a) || orphans.includes(addrV2a);
+                    const isV2bInvolved = bases.includes(addrV2b) || orphans.includes(addrV2b);
+                    iReckon(sir, isV2aInvolved).asTo('V2a is involved in graft').isGonnaBeTrue();
+                    iReckon(sir, isV2bInvolved).asTo('V2b is involved in graft').isGonnaBeTrue();
+                }
+            }
+            catch (error) {
+                console.error(`${lc} ${extractErrorMsg(error)}`);
+                iReckon(sir, true).asTo('getKnowledgeVector errored out').isGonnaBeFalse();
+            }
         });
     });
 });

package/dist/sync/sync-conflict.respec.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sync-conflict.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict.respec.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-conflict.respec.mjs","sourceRoot":"","sources":["../../src/sync/sync-conflict.respec.mts"],"names":[],"mappings":"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"}

package/dist/sync/sync-constants.d.mts

@@ -10,14 +10,12 @@ export declare const SYNC_STAGE_ACK = "ack";
 export declare const SYNC_STAGE_REQUEST = "request";
 export declare const SYNC_STAGE_DELTA = "delta";
 export declare const SYNC_STAGE_COMMIT = "commit";
-export declare const SYNC_STAGE_CONFLICT = "conflict";
-export type SyncStage = typeof SYNC_STAGE_INIT | typeof SYNC_STAGE_ACK | typeof SYNC_STAGE_REQUEST | typeof SYNC_STAGE_DELTA | typeof SYNC_STAGE_COMMIT | typeof SYNC_STAGE_CONFLICT;
+export type SyncStage = typeof SYNC_STAGE_INIT | typeof SYNC_STAGE_ACK | typeof SYNC_STAGE_REQUEST | typeof SYNC_STAGE_DELTA | typeof SYNC_STAGE_COMMIT;
 export declare const SyncStage: {
     readonly init: "init";
     readonly ack: "ack";
     readonly request: "request";
     readonly delta: "delta";
     readonly commit: "commit";
-    readonly conflict: "conflict";
 };
 //# sourceMappingURL=sync-constants.d.mts.map

package/dist/sync/sync-constants.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-constants.d.mts","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,kCAAkC,kBAAkB,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAE7C,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,gBAAgB,UAAU,CAAC;AACxC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,MAAM,MAAM,SAAS,GACf,OAAO,eAAe,GACtB,OAAO,cAAc,GACrB,OAAO,kBAAkB,GACzB,OAAO,gBAAgB,GACvB,OAAO,iBAAiB,GACxB,OAAO,mBAAmB,CAAC;AAEjC,eAAO,MAAM,SAAS;;;;;;;CAOZ,CAAC"}
+{"version":3,"file":"sync-constants.d.mts","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,SAAS,CAAC;AAEhC,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAC9C,eAAO,MAAM,kCAAkC,kBAAkB,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,eAAe,CAAC;AAE7C,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,gBAAgB,UAAU,CAAC;AACxC,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAE1C,MAAM,MAAM,SAAS,GACf,OAAO,eAAe,GACtB,OAAO,cAAc,GACrB,OAAO,kBAAkB,GACzB,OAAO,gBAAgB,GACvB,OAAO,iBAAiB,CAAC;AAE/B,eAAO,MAAM,SAAS;;;;;;CAMZ,CAAC"}

package/dist/sync/sync-constants.mjs

@@ -10,13 +10,11 @@ export const SYNC_STAGE_ACK = "ack";
 export const SYNC_STAGE_REQUEST = "request";
 export const SYNC_STAGE_DELTA = "delta";
 export const SYNC_STAGE_COMMIT = "commit";
-export const SYNC_STAGE_CONFLICT = "conflict";
 export const SyncStage = {
     init: SYNC_STAGE_INIT,
     ack: SYNC_STAGE_ACK,
     request: SYNC_STAGE_REQUEST,
     delta: SYNC_STAGE_DELTA,
     commit: SYNC_STAGE_COMMIT,
-    conflict: SYNC_STAGE_CONFLICT,
 };
 //# sourceMappingURL=sync-constants.mjs.map

package/dist/sync/sync-constants.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sync-constants.mjs","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAC9C,MAAM,CAAC,MAAM,kCAAkC,GAAG,eAAe,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC;AACpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACxC,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAU9C,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,IAAI,EAAE,eAAe;IACrB,GAAG,EAAE,cAAc;IACnB,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,MAAM,EAAE,iBAAiB;IACzB,QAAQ,EAAE,mBAAmB;CACvB,CAAC"}
+{"version":3,"file":"sync-constants.mjs","sourceRoot":"","sources":["../../src/sync/sync-constants.mts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAC9C,MAAM,CAAC,MAAM,kCAAkC,GAAG,eAAe,CAAC;AAElE;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC;AAE7C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC;AACtC,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,CAAC;AACpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAC5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AACxC,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AAS1C,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,IAAI,EAAE,eAAe;IACrB,GAAG,EAAE,cAAc;IACnB,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,gBAAgB;IACvB,MAAM,EAAE,iBAAiB;CACnB,CAAC"}

package/dist/sync/sync-peer/sync-peer-innerspace-v1.d.mts

@@ -3,15 +3,17 @@
  */
 import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
 import { IbGibSpaceAny } from '../../witness/space/space-base-v1.mjs';
-import { SyncSagaContextIbGib_V1 } from '../sync-saga-context/sync-saga-context-types.mjs';
-import { SyncPeer_V1 } from './sync-peer-v1.mjs';
 import { SyncSagaCoordinator } from '../sync-saga-coordinator.mjs';
 import { MetaspaceService } from '../../witness/space/metaspace/metaspace-types.mjs';
+import { SyncPeer_V1 } from './sync-peer-v1.mjs';
+import { SyncSagaContextIbGib_V1 } from '../sync-saga-context/sync-saga-context-types.mjs';
 export interface SyncPeerInnerspaceOptions {
     senderSpace: IbGibSpaceAny;
+    senderTempSpace?: IbGibSpaceAny;
     receiverSpace: IbGibSpaceAny;
     receiverCoordinator: SyncSagaCoordinator;
     receiverMetaspace: MetaspaceService;
+    receiverTempSpace?: IbGibSpaceAny;
 }
 /**
  * Concrete implementation of SyncPeer for local in-memory simulation (Innerspace to Innerspace).
@@ -23,6 +25,7 @@ export declare class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
     opts: SyncPeerInnerspaceOptions;
     protected lc: string;
     constructor(opts: SyncPeerInnerspaceOptions);
+    private ensureReceiverTempSpace;
     protected getLocalIbGib(addr: string): Promise<IbGib_V1 | undefined>;
     protected push(addr: string): Promise<void>;
     protected pull(addr: string): Promise<void>;

package/dist/sync/sync-peer/sync-peer-innerspace-v1.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-peer-innerspace-v1.d.mts","sourceRoot":"","sources":["../../../src/sync/sync-peer/sync-peer-innerspace-v1.mts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAK3D,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AAErF,MAAM,WAAW,yBAAyB;IACtC,WAAW,EAAE,aAAa,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,gBAAgB,CAAC;CACvC;AAID;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,WAAW;IAKvC,IAAI,EAAE,yBAAyB;IAH1C,SAAS,CAAC,EAAE,EAAE,MAAM,CAAqC;gBAG9C,IAAI,EAAE,yBAAyB;cAK1B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;cAK1D,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAIjC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAIjC,WAAW,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAwE3G;;OAEG;cACa,QAAQ,CAAC,EACrB,IAAI,EACJ,IAAI,EACJ,EAAE,EACL,EAAE;QACC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,aAAa,CAAC;QACpB,EAAE,EAAE,aAAa,CAAA;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BpB"}
+{"version":3,"file":"sync-peer-innerspace-v1.d.mts","sourceRoot":"","sources":["../../../src/sync/sync-peer/sync-peer-innerspace-v1.mts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAK3D,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kDAAkD,CAAC;AAG3F,MAAM,WAAW,yBAAyB;IACtC,WAAW,EAAE,aAAa,CAAC;IAC3B,eAAe,CAAC,EAAE,aAAa,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,gBAAgB,CAAC;IACpC,iBAAiB,CAAC,EAAE,aAAa,CAAC;CACrC;AAID;;;;;GAKG;AACH,qBAAa,qBAAsB,SAAQ,WAAW;IAKvC,IAAI,EAAE,yBAAyB;IAH1C,SAAS,CAAC,EAAE,EAAE,MAAM,CAAqC;gBAG9C,IAAI,EAAE,yBAAyB;YAK5B,uBAAuB;cAoBrB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;cAK1D,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAIjC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAIjC,WAAW,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IA2H3G;;OAEG;cACa,QAAQ,CAAC,EACrB,IAAI,EACJ,IAAI,EACJ,EAAE,EACL,EAAE;QACC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,aAAa,CAAC;QACpB,EAAE,EAAE,aAAa,CAAA;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BpB"}

package/dist/sync/sync-peer/sync-peer-innerspace-v1.mjs

@@ -4,10 +4,10 @@
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../core-constants.mjs';
-import { SYNC_ATOM } from '../sync-constants.mjs';
+import { SYNC_ATOM, SYNC_MSG_REL8N_NAME } from '../sync-constants.mjs';
 import { SyncPeer_V1 } from './sync-peer-v1.mjs';
-import { createSyncSagaContext } from '../sync-saga-context/sync-saga-context-helpers.mjs';
 import { getFromSpace, putInSpace } from '../../witness/space/space-helper.mjs';
+import { createSyncSagaContext } from '../sync-saga-context/sync-saga-context-helpers.mjs';
 const logalot = GLOBAL_LOG_A_LOT || true;
 /**
  * Concrete implementation of SyncPeer for local in-memory simulation (Innerspace to Innerspace).
@@ -22,6 +22,25 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
         super(opts.receiverSpace.data); // Use receiver space data as initial phantom data? Or empty.
         this.opts = opts;
     }
+    async ensureReceiverTempSpace() {
+        if (!this.opts.receiverTempSpace) {
+            const { receiverMetaspace } = this.opts;
+            const uuid = crypto.randomUUID ? crypto.randomUUID() : Math.random().toString(36);
+            const tempSpaceName = `tmp_sync_recv_${uuid.substring(0, 8)}`;
+            this.opts.receiverTempSpace = await receiverMetaspace.createNewLocalSpace({
+                opts: {
+                    allowCancel: false,
+                    spaceName: tempSpaceName,
+                    getFnPrompt: receiverMetaspace.getFnPrompt,
+                    logalot
+                }
+            });
+            if (this.opts.receiverTempSpace) {
+                await this.opts.receiverTempSpace.initialized;
+            }
+        }
+        return this.opts.receiverTempSpace; // Non-null assertion since we just created it
+    }
     async getLocalIbGib(addr) {
         const res = await getFromSpace({ space: this.opts.senderSpace, addr });
         return res.ibGibs?.[0];
@@ -49,6 +68,24 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
             if (!sagaFrame) {
                 throw new Error(`${lc} sagaFrame not found in receiver space: ${sagaFrameAddr} (E: 2c0190bd04ea408c909618193850029b)`);
             }
+            // Ensure receiverTempSpace exists
+            const receiverTempSpace = await this.ensureReceiverTempSpace();
+            // Store saga frame in tempSpace for easy queries during transaction
+            // (Control ibgibs like saga frames and msg stones go in BOTH spaces:
+            //  destSpace for audit trail, tempSpace for easy queries)
+            await putInSpace({ space: receiverTempSpace, ibGib: sagaFrame });
+            await receiverMetaspace.registerNewIbGib({ ibGib: sagaFrame });
+            // Also store the message stone (if present) in tempSpace
+            const msgStoneAddrs = sagaFrame.rel8ns?.[SYNC_MSG_REL8N_NAME];
+            if (msgStoneAddrs && msgStoneAddrs.length > 0) {
+                const resMsgStone = await getFromSpace({ space: receiverSpace, addrs: msgStoneAddrs });
+                if (resMsgStone.ibGibs) {
+                    for (const msgStone of resMsgStone.ibGibs) {
+                        await putInSpace({ space: receiverTempSpace, ibGib: msgStone });
+                        await receiverMetaspace.registerNewIbGib({ ibGib: msgStone });
+                    }
+                }
+            }
             // 2. Execute Receiver Logic
             // The Peer "Network" triggers the Receiver Coordinator.
             if (logalot) {
@@ -59,7 +96,8 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
             const result = await receiverCoordinator.handleSagaFrame({
                 sagaIbGib: sagaFrame,
                 srcGraph: {},
-                space: receiverSpace,
+                destSpace: receiverSpace, // Query existing data
+                tempSpace: receiverTempSpace, // Transaction space
                 metaspace: receiverMetaspace,
             });
             if (!result) {
@@ -72,10 +110,28 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
             if (logalot) {
                 console.log(`${lc} responseFrame addr: ${getIbGibAddr({ ibGib: responseFrame })}`);
             }
-            // 3. Persist Response Data to Receiver Space (Output Buffer)
-            // The Receiver created new data (Frame, Payload). It must be saved in Receiver Space
-            // so the "Network" can PULL it back to Sender.
-            const ibGibsToPersist = [responseFrame, ...(payloadIbGibs || [])];
+            // 3. Persist Response Control IbGibs (Frame + Msg Stones) to BOTH Spaces
+            // Control ibgibs (saga frames, msg stones, identity) go in BOTH spaces:
+            // - receiverSpace (destSpace): Audit trail
+            // - receiverTempSpace: Already there from creation in tempSpace
+            // Ensure response frame is in receiverSpace for audit trail
+            await putInSpace({ space: receiverSpace, ibGib: responseFrame });
+            await receiverMetaspace.registerNewIbGib({ ibGib: responseFrame });
+            // Ensure response msg stone is in receiverSpace for audit trail
+            const responseMsgStoneAddrs = responseFrame.rel8ns?.[SYNC_MSG_REL8N_NAME];
+            if (responseMsgStoneAddrs && responseMsgStoneAddrs.length > 0) {
+                const resResponseMsgStone = await getFromSpace({ space: receiverTempSpace, addrs: responseMsgStoneAddrs });
+                if (resResponseMsgStone.ibGibs) {
+                    for (const msgStone of resResponseMsgStone.ibGibs) {
+                        await putInSpace({ space: receiverSpace, ibGib: msgStone });
+                        await receiverMetaspace.registerNewIbGib({ ibGib: msgStone });
+                    }
+                }
+            }
+            // 4. Persist Domain Payload IbGibs
+            // Domain ibgibs stay in tempSpace ONLY until commit
+            // (they're already in the appropriate space from coordinator's work)
+            const ibGibsToPersist = [...(payloadIbGibs || [])];
             // Note: payloadIbGibs might have deep dependencies. 
             // Since they were generated/fetched by the Receiver Coordinator, 
             // we assume they are already in the Receiver Space or explicitly returned here.
@@ -85,6 +141,13 @@ export class SyncPeerInnerspace_V1 extends SyncPeer_V1 {
             // If `space` passed was `receiverSpace`, they should be there.
             // But let's explicit put to be sure.
             await putInSpace({ space: receiverSpace, ibGibs: ibGibsToPersist });
+            // CRITICAL: Also put payloadIbGibs into sender's tempSpace
+            // Sender needs these for merge logic in handleDeltaFrame (tempSpace queries)
+            // Do NOT put in sender's durable space - these are transactional!
+            if (this.opts.senderTempSpace && ibGibsToPersist.length > 0) {
+                console.log(`${lc} [CONFLICT DEBUG] Transferring ${ibGibsToPersist.length} payload ibgibs to sender's tempSpace`);
+                await putInSpace({ space: this.opts.senderTempSpace, ibGibs: ibGibsToPersist });
+            }
             // 4. Create Response Context
             const responsePayloadAddrs = payloadIbGibs?.map(p => getIbGibAddr({ ibGib: p }));
             const responseCtx = await createSyncSagaContext({

package/dist/sync/sync-peer/sync-peer-innerspace-v1.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sync-peer-innerspace-v1.mjs","sourceRoot":"","sources":["../../../src/sync/sync-peer/sync-peer-innerspace-v1.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync-peer-innerspace-v1.mjs","sourceRoot":"","sources":["../../../src/sync/sync-peer/sync-peer-innerspace-v1.mts"],"names":[],"mappings":"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"}