@ibgib/space-gib 0.0.5 → 0.0.7

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

@@ -1,140 +1,75 @@
-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 { graphsAreEquivalent } from '@ibgib/core-gib/dist/common/other/graph-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 { SESSION_KEYSTONE_POLICY, getSpaceGibPoolConfig } from "../../common/keystone-policies.mjs";
 import { SpaceGibApiBridge } from '../api/space-gib-api-bridge.mjs';
 
-import { debugState, devLog, lc } from './common.mjs';
+import {
+    debugState, devLog, lc,
+    setupDomainAndDelegateIdentities, runSyncPass, runSyncPassFromSpace, copyIdentitiesToSpace
+} from './common.mjs';
 
-// Extend debugState to support our phase-specific storage
+// Phase-specific state for items that don't fit in debugState
 interface Phase45State {
-    domainI_latest?: KeystoneIbGib_V1;
-    targetV1?: any;
     targetV2?: any;
 }
-
 const state: Phase45State = {};
 
+const MASTER_SECRET = 'test-sender-secret-phase4-5b';
+
 export function init4_5bSetupButton(): void {
     const btn = document.getElementById('btn-4-5b-setup') as HTMLButtonElement | null;
     if (!btn) { return; }
     btn.addEventListener('click', async () => {
         try {
             btn.disabled = true;
-            devLog('4.5B Setup: Generating Domain Keystone (I) and Target timeline V0 -> V1 in default local space...');
+            devLog('4.5B Setup: Generating Domain Keystone (I), target timeline, and seeding server from two spaces...');
 
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({});
             if (!space) { throw new Error("No default space."); }
 
-            const keystoneService = new KeystoneService_V1();
+            const apiBridge = new SpaceGibApiBridge();
 
-            // 1. Generate Domain Keystone (I) locally in default space
-            const domainI = await keystoneService.genesis({
-                masterSecret: 'test-sender-secret-phase4-5b',
-                configs: [
-                    getSpaceGibPoolConfig('sync', 'senderidentitysyncsaltphase4-5b'),
-                    getSpaceGibPoolConfig('manage', 'senderidentitymanagesaltphase4-5b'),
-                ],
-                metaspace,
-                space,
-                frameDetails: { client: 'space-gib-web-dev', timestamp: getTimestamp() }
+            // 1. Create domain + delegate identities (DRY helper)
+            await setupDomainAndDelegateIdentities({
+                masterSecret: MASTER_SECRET,
+                syncSalt: 'senderidentitysyncsaltphase4-5b',
+                manageSalt: 'senderidentitymanagesaltphase4-5b',
+                metaspace, space, apiBridge,
+                phaseText: '4.5B'
             });
 
-            debugState.domainI = domainI;
-            debugState.domainIMasterSecret = 'test-sender-secret-phase4-5b';
-
-            devLog(`4.5B Setup: ✓ Domain Keystone (I) created locally: ${getIbGibAddr({ ibGib: domainI })}`);
-
-            // 2. Post Genesis Domain Keystone to server
-            const apiBridge = new SpaceGibApiBridge();
-            const resGenesis = await apiBridge.postGenesisKeystone(domainI);
-            if (resGenesis.success) {
-                devLog(`4.5B Setup: ✓ Domain Keystone registered on server.`);
-            } else {
-                throw new Error(`Server rejected genesis domain keystone: ${resGenesis.message}`);
-            }
-
-            // 3. Create target timeline root V0
+            // 2. Create target timeline root V0
             const resV0 = await factory.firstGen({
                 parentIbGib: ROOT,
                 ib: 'timeline_root_partial_4_5b',
                 data: { type: 'root', label: 'Root4_5b', random: Math.random() },
-                dna: true,
-                nCounter: true,
-                tjp: { uuid: true, timestamp: true }
+                dna: true, nCounter: true, tjp: { uuid: true, timestamp: true }
             });
             const r1_v0 = resV0.newIbGib;
             await metaspace.persistTransformResult({ resTransform: resV0, space });
             await metaspace.registerNewIbGib({ ibGib: r1_v0, space });
 
-            // 4. Mutate V0 -> V1 in default space
+            // 3. Mutate V0 → V1 in default space
             const r1_v1 = await mut8Timeline({
                 timeline: r1_v0,
                 mut8Opts: { dataToAddOrPatch: { type: 'comment', label: 'V1_4_5b' } },
-                metaspace,
-                space,
+                metaspace, space,
             });
-            state.targetV1 = r1_v1;
-
+            debugState.targetC1 = r1_v1;
             devLog(`4.5B Setup: ✓ Local timeline V0 -> V1 created. V1 Tip: ${getIbGibAddr({ ibGib: r1_v1 })}`);
 
-            // 5. Run Pass 1 Sync from default local space to server via WebSocket to seed V1 on the server
+            // 4. Sync V1 to server from default space (Pass 1 — seeds V1 on the server)
             devLog('4.5B Setup: Seeding V1 to the server via WebSocket...');
-            const protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
-
-            const senderPeer1 = 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 coordinator1 = new SyncSagaCoordinator();
-            const sagaId1 = await getUUID();
-
-            await senderPeer1.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: space,
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-5b',
-                sagaId: sagaId1,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            const syncSaga1 = await coordinator1.sync({
-                domainIbGibs: [r1_v1],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-5b',
-                peer: senderPeer1,
-                localSpace: space,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSaga1.done;
+            await runSyncPass({ domainIbGibs: [r1_v1], passLabel: 'Seed V1 to server', metaspace, space });
             devLog('4.5B Setup: ✓ Pass 1 Sync (V1 to server) complete.');
 
-            // 6. Retrieve evolved I tip from default space
-            const latestSenderAddr1 = await metaspace.getLatestAddr({
-                addr: domainAddr,
-                space,
-            });
-            if (!latestSenderAddr1) { throw new Error("Could not get latest sender address from default space."); }
-            const resGetLatestI1 = await metaspace.get({ addrs: [latestSenderAddr1], space });
-            const senderIdentityEvolved1 = resGetLatestI1.ibGibs![0] as KeystoneIbGib_V1;
-
-            // 7. Create remoteSpace (simulating a remote client)
+            // 5. Create remoteSpace (simulating a remote client)
             devLog('4.5B Setup: Creating secondary local space simulating "remote" client...');
             const remoteSpaceName = `remote-${await getUUID()}`;
             const remoteSpace = await metaspace.createNewLocalSpace({
@@ -147,25 +82,16 @@ export function init4_5bSetupButton(): void {
             if (!remoteSpace) { throw new Error("Failed to create remote space"); }
             await remoteSpace.initialized;
 
-            // 8. Copy V1 and its dependency graph from default space to remoteSpace
-            const graphV1 = await metaspace.getDependencyGraph({
-                ibGibAddr: getIbGibAddr({ ibGib: r1_v1 }),
-                space
-            });
+            // 6. Copy V1 and its dependency graph + identity to remoteSpace
+            const graphV1 = await metaspace.getDependencyGraph({ ibGibAddr: getIbGibAddr({ ibGib: r1_v1 }), space });
             await metaspace.put({ ibGibs: Object.values(graphV1), space: remoteSpace });
             await metaspace.registerNewIbGib({ ibGib: r1_v1, space: remoteSpace });
 
-            // 9. Copy evolved I and its dependency graph from default space to remoteSpace
-            const graphI1 = await metaspace.getDependencyGraph({
-                ibGibAddr: latestSenderAddr1,
-                space
-            });
-            await metaspace.put({ ibGibs: Object.values(graphI1), space: remoteSpace });
-            await metaspace.registerNewIbGib({ ibGib: senderIdentityEvolved1, space: remoteSpace });
+            const domainI = debugState.domainI!;
+            await copyIdentitiesToSpace({ domainI, metaspace, fromSpace: space, toSpace: remoteSpace });
+            devLog('4.5B Setup: ✓ Copied V1 and identities (domain and delegate) to remoteSpace.');
 
-            devLog('4.5B Setup: ✓ Copied V1 and identity I to remoteSpace.');
-
-            // 10. Mutate V1 -> V2 in remoteSpace ONLY
+            // 7. Mutate V1 → V2 in remoteSpace ONLY
             devLog('4.5B Setup: Mutating V1 -> V2 in remoteSpace...');
             const r1_v2 = await mut8Timeline({
                 timeline: r1_v1,
@@ -176,56 +102,18 @@ export function init4_5bSetupButton(): void {
             state.targetV2 = r1_v2;
             devLog(`4.5B Setup: ✓ Mutated to V2 in remoteSpace: ${getIbGibAddr({ ibGib: r1_v2 })}`);
 
-            // 11. Run Pass 2 Sync from remoteSpace to server via WebSocket to push V2
+            // 8. Sync V2 from remoteSpace to server (Pass 2 — server now has V2)
             devLog('4.5B Setup: Syncing V2 from remoteSpace to the server...');
-            const senderPeer2 = 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 coordinator2 = new SyncSagaCoordinator();
-            const sagaId2 = await getUUID();
-
-            await senderPeer2.initializeOpts({
-                localMetaspace: metaspace,
-                localSpace: remoteSpace,
-                senderIdentity: senderIdentityEvolved1,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-5b',
-                sagaId: sagaId2,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            const syncSaga2 = await coordinator2.sync({
+            await runSyncPassFromSpace({
                 domainIbGibs: [r1_v2],
-                senderIdentity: senderIdentityEvolved1,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-5b',
-                peer: senderPeer2,
-                localSpace: remoteSpace,
+                passLabel: 'Seed V2 from remoteSpace',
                 metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSaga2.done;
-            devLog('4.5B Setup: ✓ Pass 2 Sync (V2 to server) complete.');
-
-            // 12. Copy evolved I tip from remoteSpace back to default space so identity remains synchronized
-            const latestSenderAddr2 = await metaspace.getLatestAddr({
-                addr: domainAddr,
                 space: remoteSpace,
+                primarySpace: space,
+                domainI,
+                masterSecret: MASTER_SECRET
             });
-            if (!latestSenderAddr2) { throw new Error("Could not get latest sender address from remoteSpace."); }
-            const resGetLatestI2 = await metaspace.get({ addrs: [latestSenderAddr2], space: remoteSpace });
-            const senderIdentityEvolved2 = resGetLatestI2.ibGibs![0] as KeystoneIbGib_V1;
-            state.domainI_latest = senderIdentityEvolved2;
-
-            const graphI2 = await metaspace.getDependencyGraph({
-                ibGibAddr: latestSenderAddr2,
-                space: remoteSpace
-            });
-            await metaspace.put({ ibGibs: Object.values(graphI2), space });
-            await metaspace.registerNewIbGib({ ibGib: senderIdentityEvolved2, space });
+            devLog('4.5B Setup: ✓ Pass 2 Sync (V2 to server) complete. debugState.domainI updated.');
 
             devLog('✓ 4.5B Setup Complete! Server has V2, default local space has V1. Ready for 4.5B Sync.');
             btn.textContent = '✓ 4.5B Setup Complete';
@@ -249,53 +137,20 @@ export function init4_5bSyncButton(): void {
             btn.disabled = true;
             devLog('4.5B Sync: Initiating WebSocket Sync from default local space (which has V1, server has V2)...');
 
-            const domainI = state.domainI_latest;
-            const targetV1 = state.targetV1;
-            if (!domainI || !targetV1) {
+            const targetV1 = debugState.targetC1;
+            if (!debugState.domainI || !targetV1) {
                 devLog('⚠ 4.5B 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({});
             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-5b',
-                sagaId,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            // Run Sync targeting our local tip V1.
-            // Since the server is ahead with V2, the coordinator should pull down V2.
-            const syncSaga = await coordinator.sync({
-                domainIbGibs: [targetV1],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-5b',
-                peer: senderPeer,
-                localSpace: space,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            });
-            await syncSaga.done;
+            // Sync targeting our local tip V1. Since the server is ahead with V2,
+            // the coordinator should pull down V2 via delta resolution.
+            await runSyncPass({ domainIbGibs: [targetV1], passLabel: 'Pull V2 from server', metaspace, space });
 
             devLog('✓ 4.5B Sync Execution Complete! Ready for 4.5B Check.');
             btn.textContent = '✓ 4.5B Sync Run';
@@ -320,13 +175,14 @@ export function init4_5bCheckButton(): void {
             devLog('4.5B Check: Verifying that V2 was pulled down to default local space...');
 
             const targetV2 = state.targetV2;
-            if (!targetV2) {
+            if (!targetV2 || !debugState.domainI) {
                 devLog('⚠ 4.5B Check: Missing target V2 in state. Did Setup run?');
                 btn.disabled = false;
                 return;
             }
 
             const targetV2Addr = getIbGibAddr({ ibGib: targetV2 });
+            const domainAddr = getIbGibAddr({ ibGib: debugState.domainI });
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({});
             if (!space) { throw new Error("No default space."); }
@@ -339,27 +195,15 @@ export function init4_5bCheckButton(): void {
             const localV2 = resGetV2.ibGibs[0];
             devLog(`4.5B Check: ✓ V2 Tip found locally. Label: "${localV2.data?.label}"`);
 
-            // 2. Fetch full dependency graph of V2 from local space
-            const localGraph = await metaspace.getDependencyGraph({
-                ibGibAddr: targetV2Addr,
-                space
-            });
-
-            // 3. Fetch full dependency graph of V2 from the server
+            // 2. Fetch full dependency graph of V2 from local space and server, assert equivalence
+            const localGraph = await metaspace.getDependencyGraph({ ibGibAddr: targetV2Addr, space });
             devLog('4.5B Check: Fetching V2 dependency graph from server...');
-            const domainAddr = getIbGibAddr({ ibGib: state.domainI_latest! });
             const apiBridge = new SpaceGibApiBridge();
             const resServerGraph = await apiBridge.getIbGibGraph(domainAddr, targetV2Addr, true);
             if (!resServerGraph.success || !resServerGraph.graph) {
                 throw new Error(`Failed to fetch V2 graph from server: ${resServerGraph.message}`);
             }
-
-            // 4. Assert graphs are equivalent
-            const equal = graphsAreEquivalent({
-                graphA: localGraph,
-                graphB: resServerGraph.graph
-            });
-
+            const equal = graphsAreEquivalent({ graphA: localGraph, graphB: resServerGraph.graph });
             if (equal) {
                 devLog('✓ 4.5B Check SUCCESS: V2 and all dependencies are fully equivalent on client and server!');
                 btn.textContent = '✓ 4.5B Check Success';

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

@@ -1,78 +1,56 @@
-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 { graphsAreEquivalent } from '@ibgib/core-gib/dist/common/other/graph-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 { SESSION_KEYSTONE_POLICY, getSpaceGibPoolConfig } from "../../common/keystone-policies.mjs";
 import { SpaceGibApiBridge } from '../api/space-gib-api-bridge.mjs';
 
-import { debugState, devLog, lc } from './common.mjs';
+import {
+    debugState, devLog, lc,
+    setupDomainAndDelegateIdentities, runSyncPass
+} from './common.mjs';
 
-// Extend debugState to support our phase-specific storage
+// Phase-specific state for targets that don't fit in debugState slots
 interface Phase46State {
-    domainI_latest?: KeystoneIbGib_V1;
     targetAlphaV1?: any;
     targetBetaV2?: any;
 }
-
 const state: Phase46State = {};
 
+const MASTER_SECRET = 'test-sender-secret-phase4-6b';
+
 export function init4_6bSetupButton(): void {
     const btn = document.getElementById('btn-4-6b-setup') as HTMLButtonElement | null;
     if (!btn) { return; }
     btn.addEventListener('click', async () => {
         try {
             btn.disabled = true;
-            devLog('4.6B Setup: Generating Domain Keystone (I) and two independent target timelines (Alpha and Beta) in default local space...');
+            devLog('4.6B Setup: Generating Domain Keystone (I) and two independent target timelines (Alpha and Beta)...');
 
             const metaspace = await getGlobalMetaspace_waitIfNeeded();
             const space = await metaspace.getLocalUserSpace({});
             if (!space) { throw new Error("No default space."); }
 
-            const keystoneService = new KeystoneService_V1();
+            const apiBridge = new SpaceGibApiBridge();
 
-            // 1. Generate Domain Keystone (I) locally in default space
-            const domainI = await keystoneService.genesis({
-                masterSecret: 'test-sender-secret-phase4-6b',
-                configs: [
-                    getSpaceGibPoolConfig('sync', 'senderidentitysyncsaltphase4-6b'),
-                    getSpaceGibPoolConfig('manage', 'senderidentitymanagesaltphase4-6b'),
-                ],
-                metaspace,
-                space,
-                frameDetails: { client: 'space-gib-web-dev', timestamp: getTimestamp() }
+            // 1. Create domain + delegate identities (DRY helper)
+            await setupDomainAndDelegateIdentities({
+                masterSecret: MASTER_SECRET,
+                syncSalt: 'senderidentitysyncsaltphase4-6b',
+                manageSalt: 'senderidentitymanagesaltphase4-6b',
+                metaspace, space, apiBridge,
+                phaseText: '4.6B'
             });
 
-            state.domainI_latest = domainI;
-            debugState.domainI = domainI;
-            debugState.domainIMasterSecret = 'test-sender-secret-phase4-6b';
-
-            devLog(`4.6B Setup: ✓ Domain Keystone (I) created locally: ${getIbGibAddr({ ibGib: domainI })}`);
-
-            // 2. Post Genesis Domain Keystone to server
-            const apiBridge = new SpaceGibApiBridge();
-            const resGenesis = await apiBridge.postGenesisKeystone(domainI);
-            if (resGenesis.success) {
-                devLog(`4.6B Setup: ✓ Domain Keystone registered on server.`);
-            } else {
-                throw new Error(`Server rejected genesis domain keystone: ${resGenesis.message}`);
-            }
-
-            // 3. Create Timeline A (root A -> mutant A1)
+            // 2. Create Timeline A (root A -> mutant A1)
             const resAlphaV0 = await factory.firstGen({
                 parentIbGib: ROOT,
                 ib: 'timeline_root_alpha_4_6b',
                 data: { type: 'root', label: 'Alpha4_6b', random: Math.random() },
-                dna: true,
-                nCounter: true,
-                tjp: { uuid: true, timestamp: true }
+                dna: true, nCounter: true, tjp: { uuid: true, timestamp: true }
             });
             const r1_alpha_v0 = resAlphaV0.newIbGib;
             await metaspace.persistTransformResult({ resTransform: resAlphaV0, space });
@@ -81,20 +59,18 @@ export function init4_6bSetupButton(): void {
             const r1_alpha_v1 = await mut8Timeline({
                 timeline: r1_alpha_v0,
                 mut8Opts: { dataToAddOrPatch: { type: 'comment', label: 'A1_4_6b' } },
-                metaspace,
-                space,
+                metaspace, space,
             });
             state.targetAlphaV1 = r1_alpha_v1;
+            debugState.targetC1 = r1_alpha_v1;
             devLog(`4.6B Setup: ✓ Local Timeline A created. A1 Tip: ${getIbGibAddr({ ibGib: r1_alpha_v1 })}`);
 
-            // 4. Create Timeline B (root B -> mutant B1 -> mutant B2)
+            // 3. Create Timeline B (root B -> mutant B1 -> mutant B2)
             const resBetaV0 = await factory.firstGen({
                 parentIbGib: ROOT,
                 ib: 'timeline_root_beta_4_6b',
                 data: { type: 'root', label: 'Beta4_6b', random: Math.random() },
-                dna: true,
-                nCounter: true,
-                tjp: { uuid: true, timestamp: true }
+                dna: true, nCounter: true, tjp: { uuid: true, timestamp: true }
             });
             const r1_beta_v0 = resBetaV0.newIbGib;
             await metaspace.persistTransformResult({ resTransform: resBetaV0, space });
@@ -103,17 +79,15 @@ export function init4_6bSetupButton(): void {
             const r1_beta_v1 = await mut8Timeline({
                 timeline: r1_beta_v0,
                 mut8Opts: { dataToAddOrPatch: { type: 'comment', label: 'B1_4_6b' } },
-                metaspace,
-                space,
+                metaspace, space,
             });
-
             const r1_beta_v2 = await mut8Timeline({
                 timeline: r1_beta_v1,
                 mut8Opts: { dataToAddOrPatch: { type: 'comment', label: 'B2_4_6b' } },
-                metaspace,
-                space,
+                metaspace, space,
             });
             state.targetBetaV2 = r1_beta_v2;
+            debugState.targetC2 = r1_beta_v2;
             devLog(`4.6B Setup: ✓ Local Timeline B created. B2 Tip: ${getIbGibAddr({ ibGib: r1_beta_v2 })}`);
 
             devLog('✓ 4.6B Setup Complete! Timelines created locally. Ready for 4.6B Sync.');
@@ -138,53 +112,24 @@ export function init4_6bSyncButton(): void {
             btn.disabled = true;
             devLog('4.6B Sync: Initiating WebSocket Sync for both Timeline A and Timeline B in one call...');
 
-            const domainI = state.domainI_latest;
             const targetAlphaV1 = state.targetAlphaV1;
             const targetBetaV2 = state.targetBetaV2;
-            if (!domainI || !targetAlphaV1 || !targetBetaV2) {
+            if (!debugState.domainI || !targetAlphaV1 || !targetBetaV2) {
                 devLog('⚠ 4.6B 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({});
             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-6b',
-                sagaId,
-                sessionConnectPoolConfig: SESSION_KEYSTONE_POLICY.CONNECT_POOL as any,
-                sessionSyncPoolConfig: SESSION_KEYSTONE_POLICY.DEFAULT_POOL as any,
-                targetAddrs: [domainAddr]
-            });
-
-            // Run Sync targeting both Alpha A1 and Beta B2 tips
-            const syncSaga = await coordinator.sync({
+            // Sync both timelines in a single call
+            await runSyncPass({
                 domainIbGibs: [targetAlphaV1, targetBetaV2],
-                senderIdentity: domainI,
-                fnSenderSecret: async () => 'test-sender-secret-phase4-6b',
-                peer: senderPeer,
-                localSpace: space,
-                metaspace,
-                conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+                passLabel: 'Sync Alpha A1 + Beta B2',
+                metaspace, space
             });
-            await syncSaga.done;
 
             devLog('✓ 4.6B Sync Execution Complete! Ready for 4.6B Check.');
             btn.textContent = '✓ 4.6B Sync Run';
@@ -208,16 +153,15 @@ export function init4_6bCheckButton(): void {
             btn.disabled = true;
             devLog('4.6B Check: Verifying both Timeline A and Timeline B exist on the server with matching dependency graphs...');
 
-            const domainI = state.domainI_latest;
             const targetAlphaV1 = state.targetAlphaV1;
             const targetBetaV2 = state.targetBetaV2;
-            if (!domainI || !targetAlphaV1 || !targetBetaV2) {
+            if (!debugState.domainI || !targetAlphaV1 || !targetBetaV2) {
                 devLog('⚠ 4.6B Check: Missing state. Did Setup and Sync run?');
                 btn.disabled = false;
                 return;
             }
 
-            const domainAddr = getIbGibAddr({ ibGib: domainI });
+            const domainAddr = getIbGibAddr({ ibGib: debugState.domainI });
             const alphaAddr = getIbGibAddr({ ibGib: targetAlphaV1 });
             const betaAddr = getIbGibAddr({ ibGib: targetBetaV2 });
 
@@ -227,36 +171,26 @@ export function init4_6bCheckButton(): void {
 
             const apiBridge = new SpaceGibApiBridge();
 
-            // 1. Verify Timeline A (Alpha V1) on server
+            // 1. Verify Timeline A on server
             devLog('4.6B Check: Fetching Timeline A dependency graph from server...');
             const resServerGraphAlpha = await apiBridge.getIbGibGraph(domainAddr, alphaAddr, true);
             if (!resServerGraphAlpha.success || !resServerGraphAlpha.graph) {
                 throw new Error(`Failed to fetch Timeline A graph from server: ${resServerGraphAlpha.message}`);
             }
-
             const localGraphAlpha = await metaspace.getDependencyGraph({ ibGibAddr: alphaAddr, space });
-            const equalAlpha = graphsAreEquivalent({
-                graphA: localGraphAlpha,
-                graphB: resServerGraphAlpha.graph
-            });
-            if (!equalAlpha) {
+            if (!graphsAreEquivalent({ graphA: localGraphAlpha, graphB: resServerGraphAlpha.graph })) {
                 throw new Error("Timeline A dependency graphs on local space and server are NOT equivalent.");
             }
             devLog('4.6B Check: ✓ Timeline A graphs are equivalent.');
 
-            // 2. Verify Timeline B (Beta V2) on server
+            // 2. Verify Timeline B on server
             devLog('4.6B Check: Fetching Timeline B dependency graph from server...');
             const resServerGraphBeta = await apiBridge.getIbGibGraph(domainAddr, betaAddr, true);
             if (!resServerGraphBeta.success || !resServerGraphBeta.graph) {
                 throw new Error(`Failed to fetch Timeline B graph from server: ${resServerGraphBeta.message}`);
             }
-
             const localGraphBeta = await metaspace.getDependencyGraph({ ibGibAddr: betaAddr, space });
-            const equalBeta = graphsAreEquivalent({
-                graphA: localGraphBeta,
-                graphB: resServerGraphBeta.graph
-            });
-            if (!equalBeta) {
+            if (!graphsAreEquivalent({ graphA: localGraphBeta, graphB: resServerGraphBeta.graph })) {
                 throw new Error("Timeline B dependency graphs on local space and server are NOT equivalent.");
             }
             devLog('4.6B Check: ✓ Timeline B graphs are equivalent.');