@ibgib/space-gib 0.0.5 → 0.0.7

package/src/client/dev-tools/phase-4-10.mts

@@ -1,21 +1,20 @@
 // #region Imports
-import { extractErrorMsg, getUUID, getTimestamp, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { extractErrorMsg, getUUID, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { Factory_V1 as factory } from '@ibgib/ts-gib/dist/V1/factory.mjs';
 import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { KeystoneIbGib_V1 } from '@ibgib/core-gib/dist/keystone/keystone-types.mjs';
-import { KeystoneService_V1 } from '@ibgib/core-gib/dist/keystone/keystone-service-v1.mjs';
 import { getGlobalMetaspace_waitIfNeeded } from "@ibgib/web-gib/dist/helpers.mjs";
 import { mut8Timeline, appendToTimeline } from '@ibgib/core-gib/dist/timeline/timeline-api.mjs';
 import { getTjpAddr } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-import { SyncPeerWebSocketSender_V1 } from '@ibgib/core-gib/dist/sync/sync-peer/sync-peer-websocket/sync-peer-websocket-sender/sync-peer-websocket-sender-v1.mjs';
 import { SyncSagaCoordinator } from '@ibgib/core-gib/dist/sync/sync-saga-coordinator.mjs';
-import { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
 import { GRAFT_BASE_REL8N_NAME, GRAFT_ORPHAN_REL8N_NAME, GRAFT_INFO_REL8N_NAME } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-constants.mjs';
-import { SESSION_KEYSTONE_POLICY, getSpaceGibPoolConfig } from "../../common/keystone-policies.mjs";
 import { SpaceGibApiBridge } from '../api/space-gib-api-bridge.mjs';
 
-import { debugState, devLog } from './common.mjs';
+import {
+    debugState, devLog, lc,
+    setupDomainAndDelegateIdentities, runSyncPass, runSyncPassFromSpace, copyIdentitiesToSpace
+} from './common.mjs';
 import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
 // #endregion Imports
 
@@ -51,34 +50,20 @@ export function init4_10bSetupButton(): void {
             const space = await metaspace.getLocalUserSpace({}) as any;
             if (!space) { throw new Error("No default space."); }
 
-            const keystoneService = new KeystoneService_V1();
-            const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const apiBridge = new SpaceGibApiBridge();
 
-            // 1. Generate Domain User Identity
-            const domainI = await keystoneService.genesis({
+            // 1. Create domain + delegate identities (DRY helper)
+            await setupDomainAndDelegateIdentities({
                 masterSecret: 'test-sender-secret-phase4-10b',
-                configs: [
-                    getSpaceGibPoolConfig('sync', 'senderidentitysyncsaltphase4-10b'),
-                    getSpaceGibPoolConfig('manage', 'senderidentitymanagesaltphase4-10b'),
-                ],
-                metaspace,
-                space,
-                frameDetails: { client: 'space-gib-web-dev', timestamp: getTimestamp() }
+                syncSalt: 'senderidentitysyncsaltphase4-10b',
+                manageSalt: 'senderidentitymanagesaltphase4-10b',
+                metaspace, space, apiBridge,
+                phaseText: '4.10B'
             });
-
+            const domainI = debugState.domainI!;
             state.domainI_initial = domainI;
             state.domainI_latest = domainI;
-            let domainI_latest = domainI;
             const domainAddr = getIbGibAddr({ ibGib: domainI });
-            devLog(`4.10B Setup: ✓ Created identity: ${domainAddr}`);
-
-            // Register on server
-            const apiBridge = new SpaceGibApiBridge();
-            const resGenesis = await apiBridge.postGenesisKeystone(domainI);
-            if (!resGenesis.success) {
-                throw new Error(`Server rejected genesis domain keystone: ${resGenesis.message}`);
-            }
-            devLog('4.10B Setup: ✓ Identity registered on server.');
 
             // 2. Create the divergent "remote" space
             devLog('4.10B Setup: Creating temporary remote space...');
@@ -92,9 +77,8 @@ export function init4_10bSetupButton(): void {
             await remoteSpace.initialized;
             state.remoteSpace = remoteSpace;
 
-            // Copy user identity to remote space
-            await metaspace.put({ ibGib: domainI, space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space: remoteSpace });
+            // Copy user identity and delegate to remote space
+            await copyIdentitiesToSpace({ domainI, metaspace, fromSpace: space, toSpace: remoteSpace });
 
             // 3. Seed common history (Round 1) locally in default space
             devLog('4.10B Setup: Creating common history for alpha...');
@@ -119,43 +103,17 @@ export function init4_10bSetupButton(): void {
 
             // Sync alpha_v0 to server immediately so server has it
             devLog('4.10B Setup: Seeding alpha_v0 to server...');
-            const senderPeerInit = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorInit = new SyncSagaCoordinator();
-            await senderPeerInit.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaInit = await coordinatorInit.sync({
+            await runSyncPass({
                 domainIbGibs: [alpha_v0],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerInit,
-                localSpace: space,
+                passLabel: 'Seed alpha_v0',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSagaInit.done;
+            state.domainI_latest = debugState.domainI;
             devLog('4.10B Setup: ✓ alpha_v0 seeded on server.');
 
-            // Fetch evolved user identity (n=2)
-            const domainLatestAddr = await metaspace.getLatestAddr({ ibGib: domainI, space });
-            if (!domainLatestAddr) { throw new Error("Could not find latest evolved identity address in local space."); }
-            const resGetLatest = await metaspace.get({ addr: domainLatestAddr, space });
-            domainI_latest = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            state.domainI_latest = domainI_latest;
-
-            // Copy to remote space
-            await metaspace.put({ ibGib: domainI_latest, space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: domainI_latest, space: remoteSpace });
+            // Copy evolved delegate and domain tip to remoteSpace
+            await copyIdentitiesToSpace({ domainI: debugState.domainI!, metaspace, fromSpace: space, toSpace: remoteSpace });
 
             // 4. Create Round 2 Divergence:
             // Client (default space): Create beta, mutate alpha fieldA, relate alpha to beta
@@ -214,43 +172,16 @@ export function init4_10bSetupButton(): void {
 
             // Sync remote Round 2 edit to server
             devLog('4.10B Setup: Pushing remote Round 2 edit to server...');
-            const senderPeerRemote = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorRemote = new SyncSagaCoordinator();
-            await senderPeerRemote.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI_latest,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaRemote = await coordinatorRemote.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: [r2_alpha_v1_remote],
-                senderIdentity: domainI_latest,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerRemote,
-                localSpace: remoteSpace,
+                passLabel: 'Push remote Round 2 edit',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-10b'
             });
-            await syncSagaRemote.done;
-            devLog('4.10B Setup: ✓ Server tip is now remote Round 2 edit.');
-
-            // Fetch evolved user identity from remote space (n=3)
-            const domainLatestAddrRemote = await metaspace.getLatestAddr({ ibGib: domainI, space: remoteSpace });
-            if (!domainLatestAddrRemote) { throw new Error("Could not find latest evolved identity address in remote space."); }
-            const resGetLatestRemote = await metaspace.get({ addr: domainLatestAddrRemote, space: remoteSpace });
-            const domainI_latestRemote = resGetLatestRemote.ibGibs![0] as KeystoneIbGib_V1;
-
-            // Copy back to default space
-            await metaspace.put({ ibGib: domainI_latestRemote, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI_latestRemote, space });
-            state.domainI_latest = domainI_latestRemote;
+            state.domainI_latest = debugState.domainI;
 
             devLog('✓ 4.10B Setup Complete! Ready for 4.10B Sync (which runs Round 2, 3, and 4 in succession).');
             btn.textContent = '✓ 4.10B Setup Complete';
@@ -295,41 +226,17 @@ export function init4_10bSyncButton(): void {
             // #region Round 2 Sync
             // ----------------------------------------------------
             devLog('4.10B Sync: Running Round 2 Sync (merging divergent alpha edits)...');
-            const senderPeerR2 = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorR2 = new SyncSagaCoordinator();
-            await senderPeerR2.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaR2 = await coordinatorR2.sync({
+            await runSyncPass({
                 domainIbGibs: [state.r2_alpha_v3_source_rel8beta],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerR2,
-                localSpace: space,
+                passLabel: 'Sync divergent alpha edits R2',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSagaR2.done;
+            state.domainI_latest = debugState.domainI;
             devLog('4.10B Sync: ✓ Round 2 Sync complete.');
 
-            // Fetch evolved user identity (n=4)
-            let domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space });
-            let resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-
-            // Copy to remote space
-            await metaspace.put({ ibGib: domainI, space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space: remoteSpace });
+            // Copy evolved delegate and domain tip to remoteSpace
+            await copyIdentitiesToSpace({ domainI: debugState.domainI!, metaspace, fromSpace: space, toSpace: remoteSpace });
             // #endregion Round 2 Sync
 
             // ----------------------------------------------------
@@ -337,7 +244,7 @@ export function init4_10bSyncButton(): void {
             // ----------------------------------------------------
             devLog('4.10B Sync: Preparing Round 3 divergence (multiple conflicting timelines)...');
             // Client: Mutate alpha (fieldC), mutate beta (betaFieldA)
-            const clientKV_R2 = await coordinatorR2.getKnowledgeMap({
+            const clientKV_R2 = await new SyncSagaCoordinator().getKnowledgeMap({
                 domainIbGibs: [state.r2_alpha_v3_source_rel8beta, state.r2_beta_v0_source],
                 space,
                 metaspace,
@@ -370,21 +277,6 @@ export function init4_10bSyncButton(): void {
 
             // Remote: Sync remote to latest merged tips, then mutate alpha (fieldD), mutate beta (betaFieldB)
             devLog('4.10B Sync: Updating remote space to latest merged tips...');
-            const senderPeerRemoteR3_Init = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorRemoteR3_Init = new SyncSagaCoordinator();
-            await senderPeerRemoteR3_Init.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
 
             // Query remoteSpace for its latest tips to initiate sync
             const alphaLatestAddrRemoteR3 = await metaspace.getLatestAddr({ addr: alpha_tjpAddr, space: remoteSpace });
@@ -400,26 +292,21 @@ export function init4_10bSyncButton(): void {
             }
 
             // Sync remote space to pull merged alpha and beta from server
-            const syncSagaRemoteR3_Init = await coordinatorRemoteR3_Init.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: domainIbGibsRemoteR3,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerRemoteR3_Init,
-                localSpace: remoteSpace,
+                passLabel: 'Pull merged R2 tips to remoteSpace',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-10b'
             });
-            await syncSagaRemoteR3_Init.done;
+            state.domainI_latest = debugState.domainI;
+
 
-            // Fetch evolved identity (n=5)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: remoteSpace });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space: remoteSpace });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space });
 
             // Now mutate alpha (fieldD) and beta (betaFieldB) in remote space
-            const remoteKV_R3 = await coordinatorRemoteR3_Init.getKnowledgeMap({ space: remoteSpace, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
+            const remoteKV_R3 = await new SyncSagaCoordinator().getKnowledgeMap({ space: remoteSpace, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
             const alpha_tipAddr_R2_remote = remoteKV_R3[alpha_tjpAddr];
             const beta_tipAddr_R2_remote = remoteKV_R3[beta_tjpAddr];
 
@@ -448,81 +335,37 @@ export function init4_10bSyncButton(): void {
 
             // Sync remote Round 3 edits to server
             devLog('4.10B Sync: Pushing remote Round 3 edits to server...');
-            const senderPeerRemoteR3 = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorRemoteR3 = new SyncSagaCoordinator();
-            await senderPeerRemoteR3.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaRemoteR3 = await coordinatorRemoteR3.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: [r3_alpha_v4_remote, r3_beta_v1_remote],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerRemoteR3,
-                localSpace: remoteSpace,
+                passLabel: 'Push remote Round 3 edits',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-10b'
             });
-            await syncSagaRemoteR3.done;
-
-            // Fetch evolved identity (n=6)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: remoteSpace });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space: remoteSpace });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space });
+            state.domainI_latest = debugState.domainI;
 
             // Sync Client Round 3 edits to server (merges client and server)
             devLog('4.10B Sync: Running Round 3 Client Sync (merging alpha & beta divergence)...');
-            const senderPeerR3 = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorR3 = new SyncSagaCoordinator();
-            await senderPeerR3.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaR3 = await coordinatorR3.sync({
+            await runSyncPass({
                 domainIbGibs: [r3_alpha_v4_source, r3_beta_v1_source],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerR3,
-                localSpace: space,
+                passLabel: 'Sync Client Round 3 edits',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSagaR3.done;
+            state.domainI_latest = debugState.domainI;
             devLog('4.10B Sync: ✓ Round 3 Sync complete.');
 
-            // Fetch evolved identity (n=7)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: space });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI, space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space: remoteSpace });
+            // Copy evolved delegate and domain tip to remoteSpace
+            await copyIdentitiesToSpace({ domainI: debugState.domainI!, metaspace, fromSpace: space, toSpace: remoteSpace });
             // #endregion Round 3 Divergence & Sync
 
             // ----------------------------------------------------
             // #region Round 4 Divergence & Sync
             // ----------------------------------------------------
             devLog('4.10B Sync: Preparing Round 4 divergence (post-graft chain edits & new timeline)...');
-            const clientKV_R3 = await coordinatorR3.getKnowledgeMap({ space, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
+            const clientKV_R3 = await new SyncSagaCoordinator().getKnowledgeMap({ space, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
             const alpha_tipAddr_R3_client = clientKV_R3[alpha_tjpAddr];
             const beta_tipAddr_R3_client = clientKV_R3[beta_tjpAddr];
 
@@ -590,21 +433,6 @@ export function init4_10bSyncButton(): void {
 
             // Remote: Sync remote to latest merged tips, then mutate alpha (fieldG), mutate beta (betaFieldC)
             devLog('4.10B Sync: Updating remote space to Round 3 merged tips...');
-            const senderPeerRemoteR4_Init = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorRemoteR4_Init = new SyncSagaCoordinator();
-            await senderPeerRemoteR4_Init.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
 
             // Query remoteSpace for its latest tips to initiate sync
             const alphaLatestAddrRemoteR4 = await metaspace.getLatestAddr({ addr: alpha_tjpAddr, space: remoteSpace });
@@ -619,27 +447,19 @@ export function init4_10bSyncButton(): void {
                 domainIbGibsRemoteR4.push(resGetBetaRemoteTipR4.ibGibs![0]);
             }
 
-            const syncSagaRemoteR4_Init = await coordinatorRemoteR4_Init.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: domainIbGibsRemoteR4,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerRemoteR4_Init,
-                localSpace: remoteSpace,
+                passLabel: 'Pull merged R3 tips to remoteSpace',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-10b'
             });
-            await syncSagaRemoteR4_Init.done;
-
-
-            // Fetch evolved identity (n=8)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: remoteSpace });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space: remoteSpace });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space });
+            state.domainI_latest = debugState.domainI;
 
             // Mutate alpha (fieldG) and beta (betaFieldC) in remote space
-            const remoteKV_R4 = await coordinatorRemoteR4_Init.getKnowledgeMap({ space: remoteSpace, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
+            const remoteKV_R4 = await new SyncSagaCoordinator().getKnowledgeMap({ space: remoteSpace, metaspace, domainIbGibs: [alpha_v0, state.r2_beta_v0_source] });
             const alpha_tipAddr_R3_remote = remoteKV_R4[alpha_tjpAddr];
             const beta_tipAddr_R3_remote = remoteKV_R4[beta_tjpAddr];
 
@@ -668,74 +488,26 @@ export function init4_10bSyncButton(): void {
 
             // Sync remote edits to server
             devLog('4.10B Sync: Pushing remote Round 4 edits to server...');
-            const senderPeerRemoteR4 = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorRemoteR4 = new SyncSagaCoordinator();
-            await senderPeerRemoteR4.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaRemoteR4 = await coordinatorRemoteR4.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: [r4_alpha_v5_remote, r4_beta_v2_remote],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerRemoteR4,
-                localSpace: remoteSpace,
+                passLabel: 'Push remote Round 4 edits',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-10b'
             });
-            await syncSagaRemoteR4.done;
-
-
-            // Fetch evolved identity (n=9)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: remoteSpace });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space: remoteSpace });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI, space });
+            state.domainI_latest = debugState.domainI;
 
             // Sync Client Round 4 edits to server (merges client and server final states)
             devLog('4.10B Sync: Running final Round 4 Client Sync (merging alpha, beta, and propagating gamma)...');
-            // debugger; // walk through this, but a breakpoint on createInitFrame
-            const senderPeerR4 = new SyncPeerWebSocketSender_V1({
-                classname: 'SyncPeerWebSocketSender_V1',
-                httpEvolveUrl: `${location.protocol}//${location.host}/api/keystone/evolve/${encodeURIComponent(domainAddr)}`,
-                wsUrl: `${protocol}//${location.host}/api/sync/ws/${encodeURIComponent(domainAddr)}`
-            });
-            const coordinatorR4 = new SyncSagaCoordinator();
-            await senderPeerR4.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaR4 = await coordinatorR4.sync({
+            await runSyncPass({
                 domainIbGibs: [r4_alpha_v7_source, r4_beta_v2_source, gamma_v0_source],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-10b',
-                peer: senderPeerR4,
-                localSpace: space,
+                passLabel: 'Sync final Round 4 edits',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSagaR4.done;
-
-            // Fetch final evolved identity (n=10)
-            domainLatestAddr = await metaspace.getLatestAddr({ ibGib: state.domainI_initial!, space: space });
-            resGetLatest = await metaspace.get({ addr: domainLatestAddr!, space });
-            domainI = resGetLatest.ibGibs![0] as KeystoneIbGib_V1;
-            state.domainI_latest = domainI;
+            state.domainI_latest = debugState.domainI;
 
             devLog('✓ 4.10B Sync: All rounds of divergent edits and merges complete!');
             btn.textContent = '✓ 4.10B Sync Complete';