@ibgib/space-gib 0.0.4 → 0.0.6

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

@@ -1,92 +1,64 @@
-import { extractErrorMsg, getUUID, getTimestamp } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { extractErrorMsg, getUUID } 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 } 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';
 
 interface Phase47State {
-    domainI_latest?: KeystoneIbGib_V1;
     testRoot?: any;
     targetAlphaV2a?: any;
     targetBetaV2b?: any;
 }
-
 const state: Phase47State = {};
 
+const MASTER_SECRET = 'test-sender-secret-phase4-7b';
+
 export function init4_7bSetupButton(): void {
     const btn = document.getElementById('btn-4-7b-setup') as HTMLButtonElement | null;
     if (!btn) { return; }
     btn.addEventListener('click', async () => {
         try {
             btn.disabled = true;
-            devLog('4.7B Setup: Setting up identities, seeding history, and creating divergent branches in client and remote...');
+            devLog('4.7B Setup: Setting up identities, seeding history, and creating divergent branches...');
 
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             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({
-                masterSecret: 'test-sender-secret-phase4-7b',
-                configs: [
-                    getSpaceGibPoolConfig('sync', 'senderidentitysyncsaltphase4-7b'),
-                    getSpaceGibPoolConfig('manage', 'senderidentitymanagesaltphase4-7b'),
-                ],
-                metaspace,
-                space,
-                frameDetails: { client: 'space-gib-web-dev', timestamp: getTimestamp() }
+            await setupDomainAndDelegateIdentities({
+                masterSecret: MASTER_SECRET,
+                syncSalt: 'senderidentitysyncsaltphase4-7b',
+                manageSalt: 'senderidentitymanagesaltphase4-7b',
+                metaspace, space, apiBridge, phaseText: '4.7B'
             });
-            state.domainI_latest = domainI;
-            let domainI_latest: any = domainI;
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
-            devLog(`4.7B 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.7B Setup: ✓ Identity registered on server.');
+            const domainI = debugState.domainI!;
 
-            // 2. Create the divergent "remote" space
-            devLog('4.7B Setup: Creating temporary remote space...');
             const remoteSpace = await metaspace.createNewLocalSpace({
-                opts: {
-                    allowCancel: false,
-                    spaceName: 'remote_space_4_7b',
-                    getFnPrompt: metaspace.getFnPrompt!
-                }
+                opts: { allowCancel: false, spaceName: 'remote_space_4_7b', getFnPrompt: metaspace.getFnPrompt! }
             }) as any;
             await remoteSpace.initialized;
-
-            // Copy user identity to remote space
             await metaspace.put({ ibGib: domainI, space: remoteSpace });
             await metaspace.registerNewIbGib({ ibGib: domainI, space: remoteSpace });
 
-            // 3. Seed common history root -> v1 locally
             const resRoot = await factory.firstGen({
                 parentIbGib: ROOT,
                 ib: 'timeline_root_conflict_4_7b',
                 data: { type: 'root', label: 'CommonRoot', random: Math.random() },
-                dna: true,
-                nCounter: true,
-                tjp: { uuid: true, timestamp: true }
+                dna: true, nCounter: true, tjp: { uuid: true, timestamp: true }
             });
             const testRoot = resRoot.newIbGib;
             await metaspace.persistTransformResult({ resTransform: resRoot, space });
@@ -96,130 +68,44 @@ export function init4_7bSetupButton(): void {
             const v1_common = await mut8Timeline({
                 timeline: testRoot,
                 mut8Opts: { dataToAddOrPatch: { type: 'comment', label: 'V1Common' } },
-                metaspace,
-                space,
+                metaspace, space,
             });
 
-            // 4. Copy common history to remote space
             const graphRoot = await metaspace.getDependencyGraph({ ibGibAddr: getIbGibAddr({ ibGib: testRoot }), space });
             const graphV1 = await metaspace.getDependencyGraph({ ibGibAddr: getIbGibAddr({ ibGib: v1_common }), space });
-            const commonDepGraph = { ...graphRoot, ...graphV1 };
-            await metaspace.put({ ibGibs: Object.values(commonDepGraph), space: remoteSpace });
+            await metaspace.put({ ibGibs: Object.values({ ...graphRoot, ...graphV1 }), space: remoteSpace });
             await metaspace.registerNewIbGib({ ibGib: testRoot, space: remoteSpace });
             await metaspace.registerNewIbGib({ ibGib: v1_common, space: remoteSpace });
 
-            // 5. Initial sync of v1_common to the server so server has it
             devLog('4.7B Setup: Syncing v1_common 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-7b',
-                sagaId: await getUUID(),
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaInit = await coordinatorInit.sync({
-                domainIbGibs: [v1_common],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-7b',
-                peer: senderPeerInit,
-                localSpace: space,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSagaInit.done;
+            await runSyncPass({ domainIbGibs: [v1_common], passLabel: 'Seed v1_common', metaspace, space });
             devLog('4.7B Setup: ✓ Seeding complete on server.');
 
-            // Fetch evolved user identity from space (now at 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 });
-            if (!resGetLatest.success || !resGetLatest.ibGibs || resGetLatest.ibGibs.length === 0) {
-                throw new Error("Could not find latest evolved identity in local space.");
-            }
-            domainI_latest = resGetLatest.ibGibs[0] as KeystoneIbGib_V1;
-            state.domainI_latest = domainI_latest;
-            devLog(`4.7B Setup: ✓ Fetched evolved identity: ${domainLatestAddr}`);
-
-            // Copy evolved user identity to remote space
-            await metaspace.put({ ibGib: domainI_latest, space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: domainI_latest, space: remoteSpace });
+            const domainIEvolved = debugState.domainI!;
+            await copyIdentitiesToSpace({ domainI: domainIEvolved, metaspace, fromSpace: space, toSpace: remoteSpace });
 
-            // 6. Create Divergence:
-            // Client (default space) gets V2a (fieldA edit)
             const v2a = await mut8Timeline({
-                timeline: v1_common,
-                mut8Opts: { dataToAddOrPatch: { fieldA: 'source_edit' } },
-                metaspace,
-                space,
+                timeline: v1_common, mut8Opts: { dataToAddOrPatch: { fieldA: 'source_edit' } }, metaspace, space,
             });
             state.targetAlphaV2a = v2a;
             devLog(`4.7B Setup: ✓ Created client divergent edit V2a: ${getIbGibAddr({ ibGib: v2a })}`);
 
-            // Remote Space gets V2b (fieldB edit)
             const v2b = await mut8Timeline({
-                timeline: v1_common,
-                mut8Opts: { dataToAddOrPatch: { fieldB: 'dest_edit' } },
-                metaspace,
-                space: remoteSpace,
+                timeline: v1_common, mut8Opts: { dataToAddOrPatch: { fieldB: 'dest_edit' } }, metaspace, space: remoteSpace,
             });
             state.targetBetaV2b = v2b;
             devLog(`4.7B Setup: ✓ Created remote divergent edit V2b: ${getIbGibAddr({ ibGib: v2b })}`);
 
-            // 7. Sync V2b from remote space to server, so server tip becomes V2b
             devLog('4.7B Setup: Pushing V2b from remote space 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)}`
+            await runSyncPassFromSpace({
+                domainIbGibs: [v2b], passLabel: 'Push V2b from remoteSpace',
+                metaspace, space: remoteSpace, primarySpace: space,
+                domainI: domainIEvolved, masterSecret: MASTER_SECRET,
             });
-            const coordinatorRemote = new SyncSagaCoordinator();
-            await senderPeerRemote.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: domainI_latest,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-7b',
-                sagaId: await getUUID(),
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-            const syncSagaRemote = await coordinatorRemote.sync({
-                domainIbGibs: [v2b],
-                senderIdentity: domainI_latest,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-7b',
-                peer: senderPeerRemote,
-                localSpace: remoteSpace,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSagaRemote.done;
             devLog('4.7B Setup: ✓ Server tip is now V2b.');
 
-            // Fetch evolved user identity from remote space (now at 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 });
-            if (!resGetLatestRemote.success || !resGetLatestRemote.ibGibs || resGetLatestRemote.ibGibs.length === 0) {
-                throw new Error("Could not find latest evolved identity in remote space.");
-            }
-            const domainI_latestRemote = resGetLatestRemote.ibGibs[0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI_latestRemote, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI_latestRemote, space });
-            state.domainI_latest = domainI_latestRemote;
-            devLog(`4.7B Setup: ✓ Copied evolved identity tip (n=3) back to default space: ${domainLatestAddrRemote}`);
-
             devLog('✓ 4.7B Setup Complete! Ready for 4.7B Sync.');
             btn.textContent = '✓ 4.7B Setup Complete';
-
             const syncBtn = document.getElementById('btn-4-7b-sync') as HTMLButtonElement | null;
             if (syncBtn) { syncBtn.disabled = false; }
 
@@ -238,60 +124,20 @@ export function init4_7bSyncButton(): void {
         try {
             btn.disabled = true;
             devLog('4.7B Sync: Initiating WebSocket Sync for divergent edit V2a...');
-
-            const domainI = state.domainI_latest;
             const targetAlphaV2a = state.targetAlphaV2a;
-            if (!domainI || !targetAlphaV2a) {
+            if (!debugState.domainI || !targetAlphaV2a) {
                 devLog('⚠ 4.7B Sync: Missing setup state. Please run Setup first.');
                 btn.disabled = false;
                 return;
             }
-
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({}) as any;
             if (!space) { throw new Error("No default space."); }
-
-            const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-
-            const senderPeer = 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 coordinator = new SyncSagaCoordinator();
-            const sagaId = await getUUID();
-
-            await senderPeer.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-7b',
-                sagaId,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            // Run Sync. Server has V2b, client has V2a. This will trigger optimistic graft merge!
-            const syncSaga = await coordinator.sync({
-                domainIbGibs: [targetAlphaV2a],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-7b',
-                peer: senderPeer,
-                localSpace: space,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSaga.done;
-
+            await runSyncPass({ domainIbGibs: [targetAlphaV2a], passLabel: 'Sync V2a (conflict merge)', metaspace, space });
             devLog('✓ 4.7B Sync Execution Complete! Ready for 4.7B Check.');
             btn.textContent = '✓ 4.7B Sync Run';
-
             const checkBtn = document.getElementById('btn-4-7b-check') as HTMLButtonElement | null;
             if (checkBtn) { checkBtn.disabled = false; }
-
         } catch (error) {
             devLog(`✗ 4.7B Sync FAILED: ${extractErrorMsg(error)}`);
             console.error(error);
@@ -307,87 +153,57 @@ export function init4_7bCheckButton(): void {
         try {
             btn.disabled = true;
             devLog('4.7B Check: Verifying merged tip (V3) contains both edits on client and server...');
-
-            const domainI = state.domainI_latest;
             const testRoot = state.testRoot;
             const targetAlphaV2a = state.targetAlphaV2a;
             const targetBetaV2b = state.targetBetaV2b;
-            if (!domainI || !testRoot || !targetAlphaV2a || !targetBetaV2b) {
+            if (!debugState.domainI || !testRoot || !targetAlphaV2a || !targetBetaV2b) {
                 devLog('⚠ 4.7B Check: Missing state. Did Setup and Sync run?');
                 btn.disabled = false;
                 return;
             }
-
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
+            const domainAddr = getIbGibAddr({ ibGib: debugState.domainI });
             const tjpAddr = getTjpAddr({ ibGib: testRoot, defaultIfNone: 'incomingAddr' }) ?? getIbGibAddr({ ibGib: testRoot });
-
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({}) as any;
             if (!space) { throw new Error("No default space."); }
 
-            // 1. Check client default space tip
-            const clientKV = await metaspace.getLocalUserSpace({}).then((space: any) => {
-                return new SyncSagaCoordinator().getKnowledgeMap({
-                    space,
-                    metaspace,
-                    domainIbGibs: [testRoot]
-                });
-            });
+            const clientKV = await (metaspace.getLocalUserSpace({}) as Promise<any>).then((sp: any) =>
+                new SyncSagaCoordinator().getKnowledgeMap({ space: sp, metaspace, domainIbGibs: [testRoot] })
+            );
             const clientTipAddr = clientKV[tjpAddr];
             devLog(`4.7B Check: Client tip address: ${clientTipAddr}`);
-
-            if (!clientTipAddr) {
-                throw new Error("Client default space is missing the timeline tip.");
-            }
+            if (!clientTipAddr) { throw new Error("Client default space is missing the timeline tip."); }
 
             const resTip = await metaspace.get({ addr: clientTipAddr, space });
-            if (!resTip.success || !resTip.ibGibs || resTip.ibGibs.length === 0) {
-                throw new Error("Client tip not found in default local space.");
-            }
+            if (!resTip.success || !resTip.ibGibs?.length) { throw new Error("Client tip not found in default local space."); }
             const clientTip = resTip.ibGibs[0];
-
-            if (!clientTip.data || !clientTip.data.fieldA || !clientTip.data.fieldB) {
-                throw new Error(`Merged client tip is missing expected data edits: fieldA: ${clientTip.data?.fieldA}, fieldB: ${clientTip.data?.fieldB}`);
+            if (!clientTip.data?.fieldA || !clientTip.data?.fieldB) {
+                throw new Error(`Merged client tip missing edits: fieldA: ${clientTip.data?.fieldA}, fieldB: ${clientTip.data?.fieldB}`);
             }
             devLog('4.7B Check: ✓ Client tip has both fieldA and fieldB edits.');
 
-            // Verify graftinfo rel8n exists
             const graftInfoRel = clientTip.rel8ns?.[GRAFT_INFO_REL8N_NAME];
-            if (!graftInfoRel?.[0]) {
-                throw new Error("Client tip is missing graftinfo relations.");
-            }
+            if (!graftInfoRel?.[0]) { throw new Error("Client tip is missing graftinfo relations."); }
             const resGraft = await metaspace.get({ addr: graftInfoRel[0], space });
-            if (!resGraft.success || !resGraft.ibGibs || resGraft.ibGibs.length === 0) {
-                throw new Error("GraftInfo not found in local space.");
-            }
+            if (!resGraft.success || !resGraft.ibGibs?.length) { throw new Error("GraftInfo not found in local space."); }
             const graftInfo = resGraft.ibGibs[0];
-            const baseRel = graftInfo.rel8ns?.[GRAFT_BASE_REL8N_NAME];
-            const orphanRel = graftInfo.rel8ns?.[GRAFT_ORPHAN_REL8N_NAME];
-
-            if (!baseRel || !orphanRel) {
+            if (!graftInfo.rel8ns?.[GRAFT_BASE_REL8N_NAME] || !graftInfo.rel8ns?.[GRAFT_ORPHAN_REL8N_NAME]) {
                 throw new Error("GraftInfo is missing graftbase or graftorphan relations.");
             }
             devLog('4.7B Check: ✓ Client graft base and orphan relations are correctly set.');
 
-            // 2. Check server tip
             const apiBridge = new SpaceGibApiBridge();
-            devLog('4.7B Check: Fetching server timeline graph...');
             const resServerGraph = await apiBridge.getIbGibGraph(domainAddr, clientTipAddr, true);
             if (!resServerGraph.success || !resServerGraph.graph) {
                 throw new Error(`Failed to fetch merged graph from server: ${resServerGraph.message}`);
             }
-
             const serverTip = resServerGraph.graph[clientTipAddr];
-            if (!serverTip) {
-                throw new Error("Merged V3 tip is not present on the server!");
-            }
-
+            if (!serverTip) { throw new Error("Merged V3 tip is not present on the server!"); }
             if (serverTip.data?.fieldA !== 'source_edit' || serverTip.data?.fieldB !== 'dest_edit') {
                 throw new Error("Server tip data edits do not match merged values.");
             }
             devLog('4.7B Check: ✓ Server tip has matching merged edits.');
-
-            devLog('✓ 4.7B Check SUCCESS: Divergent branches merged successfully on both client and server via optimistic graft!');
+            devLog('✓ 4.7B Check SUCCESS: Divergent branches merged successfully via optimistic graft!');
             btn.textContent = '✓ 4.7B Check Success';
 
         } catch (error) {

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

@@ -1,20 +1,19 @@
-import { extractErrorMsg, getUUID, getTimestamp } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { extractErrorMsg, getUUID } 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 { SyncSagaCoordinator } from '@ibgib/core-gib/dist/sync/sync-saga-coordinator.mjs';
 
-import { debugState, devLog } from './common.mjs';
+import {
+    debugState, devLog, lc,
+    setupDomainAndDelegateIdentities, runSyncPass, runSyncPassFromSpace, copyIdentitiesToSpace
+} from './common.mjs';
 
 interface Phase48State {
     domainI_latest?: KeystoneIbGib_V1;
@@ -37,32 +36,19 @@ export function init4_8bSetupButton(): 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-8b',
-                configs: [
-                    getSpaceGibPoolConfig('sync', 'senderidentitysyncsaltphase4-8b'),
-                    getSpaceGibPoolConfig('manage', 'senderidentitymanagesaltphase4-8b'),
-                ],
-                metaspace,
-                space,
-                frameDetails: { client: 'space-gib-web-dev', timestamp: getTimestamp() }
+                syncSalt: 'senderidentitysyncsaltphase4-8b',
+                manageSalt: 'senderidentitymanagesaltphase4-8b',
+                metaspace, space, apiBridge,
+                phaseText: '4.8B'
             });
+            const domainI = debugState.domainI!;
             state.domainI_latest = domainI;
-            let domainI_latest: any = domainI;
             const domainAddr = getIbGibAddr({ ibGib: domainI });
-            devLog(`4.8B 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.8B Setup: ✓ Identity registered on server.');
 
             // 2. Create the divergent "remote" space
             devLog('4.8B Setup: Creating temporary remote space...');
@@ -75,9 +61,8 @@ export function init4_8bSetupButton(): void {
             }) as any;
             await remoteSpace.initialized;
 
-            // 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 root -> v1 locally
             const resRoot = await factory.firstGen({
@@ -110,48 +95,16 @@ export function init4_8bSetupButton(): void {
 
             // 5. Initial sync of v1_common to the server so server has it
             devLog('4.8B Setup: Syncing v1_common 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-8b',
-                sagaId: await getUUID(),
-                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: [v1_common],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-8b',
-                peer: senderPeerInit,
-                localSpace: space,
+                passLabel: 'Seed v1_common',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSagaInit.done;
             devLog('4.8B Setup: ✓ Seeding complete on server.');
 
-            // Fetch evolved user identity from space (now at 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 });
-            if (!resGetLatest.success || !resGetLatest.ibGibs || resGetLatest.ibGibs.length === 0) {
-                throw new Error("Could not find latest evolved identity in local space.");
-            }
-            domainI_latest = resGetLatest.ibGibs[0] as KeystoneIbGib_V1;
-            state.domainI_latest = domainI_latest;
-            devLog(`4.8B Setup: ✓ Fetched evolved identity: ${domainLatestAddr}`);
-
-            // Copy evolved user identity 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 });
 
             // 6. Create Divergence:
             // Client (default space) gets V2a (fieldA edit + relates newly created independent timeline Beta)
@@ -198,46 +151,17 @@ export function init4_8bSetupButton(): void {
 
             // 7. Sync V2b from remote space to server, so server tip becomes V2b
             devLog('4.8B Setup: Pushing V2b from remote space 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-8b',
-                sagaId: await getUUID(),
-                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: [v2b],
-                senderIdentity: domainI_latest,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-8b',
-                peer: senderPeerRemote,
-                localSpace: remoteSpace,
+                passLabel: 'Push V2b from remoteSpace',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space: remoteSpace,
+                primarySpace: space,
+                domainI: debugState.domainI!,
+                masterSecret: 'test-sender-secret-phase4-8b'
             });
-            await syncSagaRemote.done;
-            devLog('4.8B Setup: ✓ Server tip is now V2b.');
-
-            // Fetch evolved user identity from remote space (now at 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 });
-            if (!resGetLatestRemote.success || !resGetLatestRemote.ibGibs || resGetLatestRemote.ibGibs.length === 0) {
-                throw new Error("Could not find latest evolved identity in remote space.");
-            }
-            const domainI_latestRemote = resGetLatestRemote.ibGibs[0] as KeystoneIbGib_V1;
-            await metaspace.put({ ibGib: domainI_latestRemote, space });
-            await metaspace.registerNewIbGib({ ibGib: domainI_latestRemote, space });
-            state.domainI_latest = domainI_latestRemote;
-            devLog(`4.8B Setup: ✓ Copied evolved identity tip (n=3) back to default space: ${domainLatestAddrRemote}`);
+            state.domainI_latest = debugState.domainI;
+            devLog('4.8B Setup: ✓ Server tip is now V2b. Evolved identity copied back.');
 
             devLog('✓ 4.8B Setup Complete! Ready for 4.8B Sync.');
             btn.textContent = '✓ 4.8B Setup Complete';
@@ -269,44 +193,17 @@ export function init4_8bSyncButton(): void {
                 return;
             }
 
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({}) as any;
             if (!space) { throw new Error("No default space."); }
 
-            const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-
-            const senderPeer = 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 coordinator = new SyncSagaCoordinator();
-            const sagaId = await getUUID();
-
-            await senderPeer.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-8b',
-                sagaId,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            // Run Sync. Client has V3a (with Beta), server has V2b. This will trigger optimistic graft merge!
-            const syncSaga = await coordinator.sync({
+            await runSyncPass({
                 domainIbGibs: [targetAlphaV3a],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-8b',
-                peer: senderPeer,
-                localSpace: space,
+                passLabel: 'Sync V3a and merge',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                space
             });
-            await syncSaga.done;
+            state.domainI_latest = debugState.domainI;
 
             devLog('✓ 4.8B Sync Execution Complete! Ready for 4.8B Check.');
             btn.textContent = '✓ 4.8B Sync Run';