@ibgib/core-gib 0.1.21 → 0.1.23

package/src/sync/sync-saga-message/sync-saga-message-types.mts

@@ -1,8 +1,9 @@
 import { IbGib_V1, IbGibData_V1, IbGibRel8ns_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
 import { KeystoneIbGib_V1 } from "../../keystone/keystone-types.mjs";
 import { SyncStage } from "../sync-constants.mjs";
-import { SyncMode, SyncConflictStrategy, SyncInitData, SyncRequestData, SyncDeltaData, SyncCommitData } from "../sync-types.mjs";
+import { SyncMode, SyncConflictStrategy, } from "../sync-types.mjs";
 import { SYNC_SAGA_MSG_ATOM } from "./sync-saga-message-constants.mjs";
+import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
 
 export interface SyncSagaMessageIb_V1 {
     atom: typeof SYNC_SAGA_MSG_ATOM;
@@ -33,9 +34,66 @@ export interface SyncSagaMessageIbGib_V1 extends IbGib_V1<SyncSagaMessageData_V1
 // CONCRETE MESSAGE PAYLOADS (EXTENDING DATA)
 // ===========================================================================
 
-export interface SyncSagaMessageInitData_V1 extends SyncSagaMessageData_V1, SyncInitData {
+/**
+ * The "Hello" of the sync protocol.
+ * 
+ * Exchanges knowledge vectors (what I have) and identity (who I am).
+ */
+export interface SyncSagaMessageInitData_V1 extends SyncSagaMessageData_V1 {
     stage: typeof SyncStage.init;
     stones: string[];
+    /**
+     * Map of TJP (Temporal Joint Point) to latest known ibGibAddr.
+     * Use this to calculate what is missing (Delta).
+     * 
+     * IOW, this is a map of the starting and end points of an ibGib's timeline.
+     */
+    knowledgeVector: { [tjp: string]: IbGibAddr };
+
+    /**
+     * The Keystone Identity of the sender.
+     * Required for the first handshake or if the receiver doesn't know the sender.
+     */
+    identity?: KeystoneIbGib_V1;
+
+    /**
+     * What the sender wants to do.
+     * e.g. "push" (I have data for you) or "pull" (Give me data).
+     * @default 'push'
+     */
+    mode?: SyncMode;
+
+    /**
+     * This is also in the sync saga ibgib itself now...
+     * 
+     * @see {@link SyncOptions.conflictStrategy}
+     */
+    conflictStrategy?: SyncConflictStrategy;
+}
+
+export interface SyncSagaConflictInfo {
+    tjpAddr: string;
+    /**
+     * "local" is relative to the POV of the creator of the conflict info
+     */
+    localAddr: string;
+    /**
+     * "remote" is relative to the POV of the creator of the conflict info
+     */
+    remoteAddr: string;
+    /**
+     * Full history of the timeline from the Receiver's perspective.
+     * Used by Sender to find LCA.
+     */
+    timelineAddrs: string[];
+    /**
+     * string description
+     */
+    reason: string;
+    /**
+     * if true, this conflict should abort the sync
+     */
+    terminal: boolean;
 }
 
 export interface SyncSagaMessageAckData_V1 extends SyncSagaMessageData_V1 {
@@ -43,31 +101,37 @@ export interface SyncSagaMessageAckData_V1 extends SyncSagaMessageData_V1 {
     deltaReqAddrs: string[];
     pushOfferAddrs: string[];
     /**
-     * Map of group keys (TJP or Constant Addr) to list of known addresses (Full History).
-     * Used by Sender to calculate differential payloads.
+     * Map of group keys (TJP addr/constant addr) to list of known addresses
+     * in that timeline.
+     * 
+     * This will be used by Sender to calculate differential payloads. So 
+     * when the sender goes to get the dependency graph of its tip ibgib,
+     * it can skip all of the addrs in this.
+     * 
+     * For example, say sender has A^5 and receiver only has A^3. Sender 
+     * will see in this map { [A^0]: [A^0, A^1, A^2, A^3] } and know that
+     * it needs all of the dependencies of A^5 (including A^4), but it does
+     * NOT need to send A^0-A^3 (and dependencies) because receiver already has
+     * these.
      */
-    knowledgeVector?: { [groupKey: string]: string[] };
+    knowledgeVector?: { [tjpAddr: string]: string[] };
     /**
      * List of identified conflicts.
      * 
-     * If present, the Sender should use the `timelineAddrs` (Receiver's history) 
-     * to compute the LCA and delta requirements for merging.
-     */
-    conflicts?: {
-        tjpAddr: string;
-        localAddr: string;
-        remoteAddr: string;
-        /**
-         * Full history of the timeline from the Receiver's perspective.
-         * Used by Sender to find LCA.
-         */
-        timelineAddrs: string[];
-        reason: string;
-        terminal: boolean;
-    }[];
+     * If present, the Sender should use the `timelineAddrs` (Receiver's
+     * history) to compute the LCA and delta requirements for merging.
+     */
+    conflicts?: SyncSagaConflictInfo[];
 }
 
-export interface SyncSagaMessageDeltaData_V1 extends SyncSagaMessageData_V1, SyncDeltaData {
+/**
+ * The "Body" of the sync protocol. Carries the manifests of data to be
+ * transferred. 
+ * 
+ * If any {@link payloadAddrsDomain} exist, then these will be populated in the
+ * {@link SyncSagaContextIbGib_V1}.
+ */
+export interface SyncSagaMessageDeltaData_V1 extends SyncSagaMessageData_V1 {
     stage: typeof SyncStage.delta;
     requests?: string[];
     /**
@@ -75,9 +139,29 @@ export interface SyncSagaMessageDeltaData_V1 extends SyncSagaMessageData_V1, Syn
      * and is ready to commit the transaction.
      */
     proposeCommit?: boolean;
+    /**
+     * Domain ibgib addresses (actual user data being synced).
+     * These go to tempSpace ONLY until final commit.
+     */
+    payloadAddrsDomain?: string[];
 }
 
-export interface SyncSagaMessageCommitData_V1 extends SyncSagaMessageData_V1, SyncCommitData {
+/**
+ * The "Seal" of the sync protocol.
+ */
+export interface SyncSagaMessageCommitData_V1 extends SyncSagaMessageData_V1 {
     stage: typeof SyncStage.commit;
+    /**
+     * True if the session completed successfully from the sender's perspective.
+     */
+    success: boolean;
+    /**
+     * Optional verification metadata (e.g. success count).
+     */
+    successCount?: number;
+    /**
+     * If failed, the reasons why.
+     */
+    errors?: string[];
 }
 

package/src/sync/sync-types.mts

@@ -1,10 +1,15 @@
+import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
 import { IbGib_V1, IbGibData_V1, IbGibRel8ns_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
 
-import { KeystoneIbGib_V1, KeystoneProof } from "../keystone/keystone-types.mjs";
-import { SYNC_ATOM, SyncStage } from "./sync-constants.mjs";
+import { SubjectWitness } from "../common/pubsub/subject/subject-types.mjs";
+import { SyncSagaContextIbGib_V1 } from "./sync-saga-context/sync-saga-context-types.mjs";
+import { KeystoneIbGib_V1, } from "../keystone/keystone-types.mjs";
+import { SYNC_ATOM, SYNC_MSG_REL8N_NAME, } from "./sync-constants.mjs";
 import { IbGibSpaceAny } from "../witness/space/space-base-v1.mjs";
 import { MetaspaceService } from "../witness/space/metaspace/metaspace-types.mjs";
 import { SyncPeerWitness } from "./sync-peer/sync-peer-types.mjs";
+import { FlatIbGibGraph } from "../common/other/graph-types.mjs";
+import { SyncSagaConflictInfo } from "./sync-saga-message/sync-saga-message-types.mjs";
 
 
 // #region SyncMode
@@ -34,6 +39,9 @@ export type SyncConflictStrategy =
     | typeof SYNC_CONFLICT_STRATEGY_ABORT
     | typeof SYNC_CONFLICT_STRATEGY_OPTIMISTIC
     | typeof SYNC_CONFLICT_STRATEGY_MANUAL;
+/**
+ * @see {@link SyncOptions.conflictStrategy}
+ */
 export const SyncConflictStrategy = {
     abort: SYNC_CONFLICT_STRATEGY_ABORT,
     optimistic: SYNC_CONFLICT_STRATEGY_OPTIMISTIC,
@@ -45,6 +53,16 @@ export function isValidSyncConflictStrategy(strategy: string): strategy is SyncC
 }
 // #endregion SyncConflictStrategy
 
+/**
+ * Result of handling a saga frame.
+ * Separates control and domain payloads.
+ */
+export interface HandleSagaFrameResult {
+    frame: SyncIbGib_V1;
+    payloadIbGibsDomain?: IbGib_V1[];
+    conflictInfos?: SyncSagaConflictInfo;
+}
+
 export interface SyncOptions {
     /**
      * The peer we are syncing with.
@@ -81,96 +99,71 @@ export interface SyncOptions {
      */
     identitySecret?: string;
     /**
-     * How to handle conflicts when both Source and Dest have diverged on the same timeline.
+     * How to handle conflicts when both Source and Dest have diverged on the
+     * same timeline.
+     * 
      * @default 'abort'
      */
     conflictStrategy?: SyncConflictStrategy;
     /**
-     * @deprecated Use `identity` instead if you have a specific identity.
-     * If true, creates an ephemeral session identity.
+     * If true, creates an ephemeral session identity for the sync process to 
+     * secure the sync transaction itself.
+     * 
      * @default true
      */
     useSessionIdentity?: boolean;
 }
 
-// ===========================================================================
-// PROTOCOL PAYLOADS
-// ===========================================================================
-
-/**
- * The "Hello" of the sync protocol.
- * Exchanges knowledge vectors (what I have) and identity (who I am).
- */
-export interface SyncInitData {
+export interface SyncSagaInfo {
     /**
-     * Map of TJP (Temporal Joint Point) to latest known ibGibAddr.
-     * Use this to calculate what is missing (Delta).
-     * 
-     * IOW, this is a map of the starting and end points of an ibGib's timeline.
+     * The unique ID of the saga.
      */
-    knowledgeVector: { [tjp: string]: string };
+    sagaId: string;
 
     /**
-     * The Keystone Identity of the sender.
-     * Required for the first handshake or if the receiver doesn't know the sender.
+     * Observable stream of context updates happening during the saga.
+     * 
+     * Subscribe to this to receive real-time progress throughout the sync
+     * process, whenever the sync ibgib is evolved (including when receiving a
+     * response from the peer).
      */
-    identity?: KeystoneIbGib_V1;
+    updates$: SubjectWitness<SyncSagaContextIbGib_V1>;
 
     /**
-     * What the sender wants to do.
-     * e.g. "push" (I have data for you) or "pull" (Give me data).
-     * @default 'push'
+     * Promise that resolves when the saga completes successfully.
      */
-    mode?: SyncMode;
-    conflictStrategy?: SyncConflictStrategy;
+    done: Promise<void>;
 }
 
-/**
- * A specific request for data.
- * Used for "pull" based deltas or fixing gaps (packet loss).
- */
-export interface SyncRequestData {
-    /**
-     * The ibGib addresses requested.
-     */
-    addrs: string[];
+export interface SyncSagaFrameDependencyGraph {
+    sagaIbGib: SyncIbGib_V1;
+    msgStones: IbGib_V1[];
+    identities: KeystoneIbGib_V1[];
 }
 
 /**
- * The "Body" of the sync protocol.
- * Carries the manifests of data to be transferred.
+ * given some group of domain ibgibs, this is info extracted from them.
  */
-export interface SyncDeltaData {
+export interface DomainIbGibAnalysisInfo {
     /**
-     * The list of ibGib addresses being transferred.
-     * The actual data is streamed/batched separately.
+     * flat array of stones (ibgibs without dna)
      */
-    payloadAddrs: string[];
-}
-
-/**
- * The "Seal" of the sync protocol.
- * The authority is derived from the `identity` relation on the Keystone Frame.
- */
-export interface SyncCommitData {
+    stones: IbGib_V1[];
     /**
-     * True if the session completed successfully from the sender's perspective.
+     * map of tjp -> sorted timeline ibgib
      */
-    success: boolean;
+    timelinesMap: { [tjp: string]: IbGib_V1[] };
     /**
-     * Optional verification metadata (e.g. success count).
+     * sorted by dependency/interdependency
      */
-    successCount?: number;
+    topologicallySortedTjpAddrs: IbGibAddr[];
     /**
-     * If failed, the reasons why.
+     * full dependency graph of domain ibgibs
      */
-    errors?: string[];
+    fullGraph: FlatIbGibGraph;
 }
 
-// ===========================================================================
-// IBGIB DATA STRUCTURES
-// ===========================================================================
-
+// #region Sync Ib, Data, Rel8ns, IbGib
 export interface SyncIb_V1 {
     atom: typeof SYNC_ATOM;
     uuid: string;
@@ -204,11 +197,6 @@ export interface SyncData_V1 extends IbGibData_V1 {
      * 2. Rate limiting / Backpressure (Don't process this old request).
      */
     expirationTimestamp?: string;
-
-    /**
-     * Polymorphic payload based on stage.
-     */
-    payload?: SyncInitData | SyncRequestData | SyncDeltaData | SyncCommitData;
 }
 
 export interface SyncRel8ns_V1 extends IbGibRel8ns_V1 {
@@ -217,30 +205,14 @@ export interface SyncRel8ns_V1 extends IbGibRel8ns_V1 {
      * This MUST point to the specific Keystone Frame that authorizes this sync frame.
      */
     identity?: string[];
-}
-
-export interface SyncIbGib_V1 extends IbGib_V1<SyncData_V1, SyncRel8ns_V1> { }
-
-/**
- * Information returned when starting a Sync Saga.
- * Allows the caller to subscribe to updates and await completion.
- */
-import { SubjectWitness } from "../common/pubsub/subject/subject-types.mjs";
-import { SyncSagaContextIbGib_V1 } from "./sync-saga-context/sync-saga-context-types.mjs";
 
-export interface SyncSagaInfo {
-    /**
-     * The unique ID of the saga.
-     */
-    sagaId: string;
     /**
-     * Stream of context updates happening during the saga.
-     * Subscribe to this to receive real-time progress.
+     * The message stone that contains the information about the particular
+     * stage of the sync process we are in.
      */
-    updates$: SubjectWitness<SyncSagaContextIbGib_V1>;
-
-    /**
-     * Promise that resolves when the saga completes successfully.
-     */
-    done: Promise<void>;
+    [SYNC_MSG_REL8N_NAME]: IbGibAddr[];
 }
+
+export interface SyncIbGib_V1 extends IbGib_V1<SyncData_V1, SyncRel8ns_V1> { }
+
+// #endregion Sync Ib, Data, Rel8ns, IbGib

package/src/timeline/timeline-api.mts

@@ -27,6 +27,8 @@ import { SpecialIbGibType } from "../common/other/other-types.mjs";
 import { getSpecialConfigKey, toDto } from "../common/other/ibgib-helper.mjs";
 import { execInSpaceWithLocking, getFromSpace, persistTransformResult } from "../witness/space/space-helper.mjs";
 import { TimelineHistoryInfo } from "./timeline-types.mjs";
+import { toFlatGraph } from "../common/other/graph-helper.mjs";
+import { FlatIbGibGraph } from "../common/other/graph-types.mjs";
 
 const logalot = GLOBAL_LOG_A_LOT;
 
@@ -845,7 +847,16 @@ export async function createTimeline<TData extends IbGibData_V1 = IbGibData_V1>(
             dna: noDna ? false : true,
             nCounter: true,
             squash: noDna ? true : false,
-            tjp: { timestamp: true, uuid: true },
+            tjp: {
+                /**
+                 * always use the timestamp to generate a unique timeline
+                 */
+                timestamp: true,
+                /**
+                 * only generate new uuid if it's not in the incoming data
+                 */
+                uuid: !data?.uuid,
+            },
         });
 
         // Persist the new timeline and its DNA to the designated space.
@@ -938,21 +949,17 @@ export async function getHistory({
         space ??= await metaspace.getLocalUserSpace({ lock: false });
         if (!space) { throw new Error(`(UNEXPECTED) space is required. (E: e3d1c0b1a9a8b7c6d5e4f3a2b1a0b9c8)`); }
 
-        const ibGibsToMap = (ibgibs: IbGib_V1[]) => {
-            const map: { [addr: IbGibAddr]: IbGib_V1 } = {};
-            ibgibs.forEach(x => { map[getIbGibAddr({ ibGib: x })] = x; });
-            return map;
-        }
-
         const headIbGib = getLatest ?
             await getLatestTimelineIbGibDto_nonLocking({ timeline, metaspace, space }) :
             toDto({ ibGib: timeline }) as IbGib_V1;
         const headAddr = getIbGibAddr({ ibGib: headIbGib });
 
-        let pastIbGibMap: { [addr: IbGibAddr]: IbGib_V1 } = {};
+        let pastIbGibMap: FlatIbGibGraph = {};
 
         const dnaMap = includeDna ?
-            ibGibsToMap(await getDna({ ibGib: headIbGib, metaspace, space })) :
+            toFlatGraph({
+                ibGibs: await getDna({ ibGib: headIbGib, metaspace, space })
+            }) :
             undefined;
 
         const pastAddrs = timeline.rel8ns?.past ?? [];
@@ -971,7 +978,7 @@ export async function getHistory({
             throw new Error(`Could not get all dna ibGibs for ${headAddr}. Addrs not found: ${notFound.join(', ')}. Errors: ${resGet.errorMsg ?? '[unknown error (E: 887339d8b5580ed1ac9892a554255525)]'} (E: 4ab7a8a58adff4e238171f7c110c6825)`);
         }
 
-        pastIbGibMap = ibGibsToMap(resGet.ibGibs!);
+        pastIbGibMap = toFlatGraph({ ibGibs: resGet.ibGibs! }) ?? {};
 
         const orderedPastIbGibs: IbGib_V1[] = [];
         for (const pastAddr of pastAddrs) {

package/src/witness/light-witness-base-v1.mts

@@ -1,5 +1,5 @@
 import { clone, getUUID, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { IbGib_V1, IbGibRel8ns_V1, } from '@ibgib/ts-gib/dist/V1/index.mjs';
+import { getGib, IbGib_V1, IbGibRel8ns_V1, } from '@ibgib/ts-gib/dist/V1/index.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../core-constants.mjs';
 import { WitnessData_V1, Witness_V1, } from './witness-types.mjs';
@@ -90,6 +90,7 @@ export abstract class LightWitnessBase_V1<
      */
     protected async initialize(): Promise<void> {
         this.instanceId = await getUUID();
+        this.gib = await getGib({ ibGib: this.toIbGibDto() });
     }
 
     /**

package/src/witness/space/inner-space/inner-space-v1.mts

@@ -199,7 +199,7 @@ export class InnerSpace_V1<
 
             if (addrsAlreadyHave.length > 0) {
                 resultData.addrsAlreadyHave = addrsAlreadyHave;
-                resultData.warnings = (resultData.warnings || []).concat([`${lc} already had addr(s): ${addrsAlreadyHave.join('|')}`]);
+                resultData.warnings = (resultData.warnings || []).concat([`${lc} already had addr(s): ${addrsAlreadyHave.join('|')}`, '(W: 7120c8267c2aaf8cad5d2f3850666826)']);
             }
             resultData.success = true;
         } catch (error) {

package/tmp.md

@@ -1,44 +1,62 @@
-PS C:\Users\billm\antigravity\ibgib\libs\core-gib> npm run test:agent 2>&1 | Select-String "TEST DEBUG"
-
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] mapWithTjp_YesDna: {"A02A08897FBD25BE9146890CD9F47A6E12C7915E4136BBC6978962538C895AA3.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":{"
-ib":"timeline_root","gib":"A02A08897FBD25BE9146890CD9F47A6E12C7915E4136BBC6978962538C895AA3.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","data":{"n":2,"timestamp":"Sat, 10 Jan 2026       
-18:29:11 GMT","timestampMs":612,"uuid":"5ca69ef03475155a24a4378693eda096500043615dc51f3845fae15a9b730168","type":"testRoot","text":"v1_common"},"rel8ns":{"ancestor":["timeline_root^gib"],"dna":["fork^DFA028E3
-3A42BCE51E9B031837A475B34B189B93349BCDF4F90077E1F031808C","mut8^F1178ECC62C184C913CA5C527C8743A0C1D0734F8E613FA8F8608E3F2445C2C6","mut8^1ED375AD0643E799DEC91A1D16CC3F103BFB34817C06D9B63FAE9EE6C0079212"],"past
-":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","timeline_root^B1383DDDBA8A29FA1984C0CB318C0603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E
-2CA606F1496F564A5C67"],"tjp":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"]}}} (I: 287e22897148298e185712c8d50cfb26)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] mapWithTjp_NoDna: {} (I: 1bdc62656294aed0f9df334647dc7326)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] timelineMap: {"timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":[
-    {
-        "ib":"timeline_root","gib":"A02A08897FBD25BE9146890CD9F47A6E12C7915E4136BBC6978962538C895AA3.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67",
-        "data":{"n":2,"timestamp":"Sat, 10 Jan 2026 18:29:11 GMT","timestampMs":612,"uuid":"5ca69ef03475155a24a437 8693eda096500043615dc51f3845fae15a9b730168","type":"testRoot","text":"v1_common"},
-        "rel8ns":{
-            "ancestor":["timeline_root^gib"],
-            "dna":["fork^DFA028E33A42BCE51E9B031837A475B34B189B93349BCDF4F90077E1F031808C","mut 8^F1178ECC62C184C913CA5C527C8743A0C1D0734F8E613FA8F8608E3F2445C2C6","mut8^1ED375AD0643E799DEC91A1D16CC3F103BFB34817C06D9B63FAE9EE6C0079212"],
-            "past":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E 2CA606F1496F564A5C67","timeline_root^B1383DDDBA8A29FA1984C0CB318C0603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"],
-            "tjp":["timeline_root^1BF1DB4C60514EFAC 6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"]
-        }
-},
-]} (I: 2cc04898e5f85179fb1ac7f827abc426)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] res.data.latestAddrsMap: {"timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":null} (I: a8e128bdf80898ac2e6d8021a5bff726)    
-[TEST DEBUG] v1_Dest: 
-{"ib":"timeline_root","gib":"A02A08897FBD25BE9146890CD9F47A6E12C7915E4136BBC6978962538C895AA3.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","data":{"n":2,"timestamp":"Sat, 10 Jan 2026     
-18:29:11 GMT","timestampMs":612,"uuid":"5ca69ef03475155a24a4378693eda096500043615dc51f3845fae15a9b730168","type":"testRoot","text":"v1_common"},"rel8ns":{"ancestor":["timeline_root^gib"],"dna":["fork^DFA028E3
-3A42BCE51E9B031837A475B34B189B93349BCDF4F90077E1F031808C","mut8^F1178ECC62C184C913CA5C527C8743A0C1D0734F8E613FA8F8608E3F2445C2C6","mut8^1ED375AD0643E799DEC91A1D16CC3F103BFB34817C06D9B63FAE9EE6C0079212"],"past
-":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","timeline_root^B1383DDDBA8A29FA1984C0CB318C0603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E 
-2CA606F1496F564A5C67"],"tjp":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"]}}
-[TEST DEBUG] v1TjpAddr: timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67
-[TEST DEBUG] destKV: {"timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":null}
-[TEST DEBUG] v1_Dest.rel8ns.tjp: timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] mapWithTjp_YesDna: {"B1383DDDBA8A29FA1984C0CB318C0603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":{"
-ib":"timeline_root","gib":"B1383DDDBA8A29FA1984C0CB318C0603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","data":{"n":1,"timestamp":"Sat, 10 Jan 2026        
-18:29:11 GMT","timestampMs":573,"uuid":"5ca69ef03475155a24a4378693eda096500043615dc51f3845fae15a9b730168","type":"testRoot","text":"v0"},"rel8ns":{"ancestor":["timeline_root^gib"],"dna":["fork^DFA028E33A42BCE 
-51E9B031837A475B34B189B93349BCDF4F90077E1F031808C","mut8^F1178ECC62C184C913CA5C527C8743A0C1D0734F8E613FA8F8608E3F2445C2C6"],"past":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5 
-C67"],"tjp":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"]}}} (I: 287e22897148298e185712c8d50cfb26)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] mapWithTjp_NoDna: {} (I: 1bdc62656294aed0f9df334647dc7326)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] timelineMap: {"timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":[{"ib":"timeline_root","gib":"B1383DDDBA8A29FA1984C0CB318C0
-603EC40D875DE100104CB14113EC2C299A1.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67","data":{"n":1,"timestamp":"Sat, 10 Jan 2026 18:29:11 GMT","timestampMs":573,"uuid":"5ca69ef03475155a24a437 
-8693eda096500043615dc51f3845fae15a9b730168","type":"testRoot","text":"v0"},"rel8ns":{"ancestor":["timeline_root^gib"],"dna":["fork^DFA028E33A42BCE51E9B031837A475B34B189B93349BCDF4F90077E1F031808C","mut8^F1178 
-ECC62C184C913CA5C527C8743A0C1D0734F8E613FA8F8608E3F2445C2C6"],"past":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"],"tjp":["timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2F 
-FBC2E8BE3E2CA606F1496F564A5C67"]}}]} (I: 2cc04898e5f85179fb1ac7f827abc426)
-[SyncSagaCoordinator][getKnowledgeVector][TEST DEBUG] res.data.latestAddrsMap: {"timeline_root^1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67":"timeline_root^585D6DC8B1653A2989DD24EAF62022AA 
-6A1A7CCB98DF5CE5F34A023DB5F9D92F.1BF1DB4C60514EFAC6A74DD268247D3B2FFBC2E8BE3E2CA606F1496F564A5C67"} (I: a8e128bdf80898ac2e6d8021a5bff726)
+Great! Ty for going through that! In crafting my response for you, I have since updated the libs\core-gib\src\sync\README.md file, so please re-read that file for me. There were several inaccuracies and it is much improved.
+
+Now for your questions. Let's get to them!
+
+## foundational
+
+1. I don't know if the conflict merging aspect is working well or not. I have implemented a similar optimistic strategy before in a previous sync prototype that worked well (though that implementation was very slow). This approach is the same, except two additions: a) naive text merge if the transform targets `data.text`, and b) adding "graft info" (libs\core-gib\src\sync\graft-info) to the timeline after the merge so that original divergent states aren't lost. Both of these should be straightforward though. The main problem right now is trying to isolate the various stages of the "ping-pong" exchange.
+
+2. Tjp is fully implemented and has been for several years now. Including the tjpGib in the full address, instead of just using a bare hash, has proved immensely useful (and as you know, this is completely novel/innovative as there is no other protocol that does this).
+
+3. We originally had control and domain payloads grouped together and we had to separate them. However, this was done poorly by the original agent, and may yet still be incomplete. AFAICT though, the most recent attempt at completing the separation was successful. The current blocking issue is that it's hard to tell what is causing the test in sync-conflict.respec.mts to fail. The logging gets too verbose and is hard to track throughout the entire transaction. 
+
+4. We are deferring integrating the session keystones until we get the non-keystone workflow going.
+
+## current state
+
+5. The immediate symptom is the test in `sync-conflict.respect.mts` is failing. You can see the output of the most recent run in C:\Users\billm\antigravity\ibgib\libs\core-gib\test_output.log .  But it is a coarse test, and really, it's hard to even read the test itself. But it's also hard to try to create more granular unit tests, though that may be the right path forward.
+
+6. AFAICT the v16 implementation plan has been partially implemented. For example, `handleAckFrame` in `saga-coordinator.mts` still has not had the `payloadIbGibs` separated properly, i.e., there is still a variable called `payloadIbGibs`, despite us mandating that there should be NO references to this. Every instance of that string should be separated into control and domain payload ibgibs. It's actually looking like that `handleAckFrame` is not right anymore, though the libs\core-gib\src\sync\sync-innerspace-dest-ahead.respec.mts test is still passing so it's not completely wrong. But if you read through that method, you'll see it's not right and there is a not-implemented error line in there.
+
+The same is true for `payloadAddrs`, which should NOT exist anywhere. But it still is on `SyncDeltaData`. It should not be "deprecated", it should have been removed and references to it should have led us to more places to complete the separation of control and domain addrs.
+
+7. I think part of the problem is that our implementation plans have been too complex and we didn't follow through to ensure that each and every piece was taken care of. Perhaps a todo/checklist would be more appropriate. But I devote quite a bit of time to refine the implementation plan, and then the nuances get lost. So we have a bunch of messy, half-completed code. Granted, this is a relatively complex sync algorithm, but it should absolutely be feasible.
+
+But let me speak to your specific questions on this:
+
+* Too many iterations/refactorings without clear direction?
+  * I don't mind the iterations. I mind thinking that something is complete and it is not. This is partially my fault in not breaking it down and unit testing it more granularly, but that would add a huge amount of overhead, and what inevitably happens is we troubleshoot the tests and not the code.
+* Type boundaries bleeding between concerns?
+  * Our types are pretty well created by this point. 
+* The polling mechanism feeling hacky?
+  * No, the polling mechanism is fine.
+* Race conditions or timing issues?
+  * There have been no race conditions that I know of.
+
+I had previous success with Antigravity on other smaller tasks, but this one seems to have been a little too advanced for the Gemini 3 High model. Your model seems to be performing better, however we hit the smaller context window rather quickly. Overall, I am just trying not to have to go through every single LoC myself, though it's looking like that is more and more likely.
+
+Here is another example I've come across that is messy. Look at the following code found in `sync-saga-coordinator.mts`:
+
+```
+// 4. EXECUTE SAGA LOOP (FSM)
+// Inject tempSpace into peer so it can pull control payloads to the right place
+if ('opts' in peer && peer.opts) {
+    (peer.opts as any).senderTempSpace = tempSpace;
+}
+```
+
+This is terrible! This is a hack so that if we have a `SyncPeerInnerspace_V1`, we set its temp space. This is "messy" to say the least.
+
+### sync test results
+
+* libs\core-gib\src\sync\sync-innerspace.respec.mts PASSING
+* libs\core-gib\src\sync\sync-innerspace-constants.respec.mts PASSING
+* libs\core-gib\src\sync\sync-innerspace-dest-ahead.respec.mts PASSING
+* libs\core-gib\src\sync\sync-innerspace-deep-updates.respec.mts PASSING
+* libs\core-gib\src\sync\sync-innerspace-multiple-timelines.respec.mts PASSING
+* libs\core-gib\src\sync\sync-innerspace-partial-update.respec.mts PASSING
+* libs\core-gib\src\sync\sync-conflict.respec.mts FAILING
+
+## how you can help
+
+All of the simpler tests that don't require a Delta frame back and forth (short back-and-forth to resolve the conflict) are all passing. I _think_ that the merge logic itself is fine, though I haven't gone through that with a fine-tooth comb yet. To me, the most obvious problem right now is that the mechanism for passing domain ibgibs back and forth is not working. For example, look in libs\core-gib\src\sync\sync-saga-coordinator.mts for `srcGraph`. That was added early on in the code sketch. IIRC, it was supposed to be for the domain ibgibs in the original sender's location. Is that another name for payloadIbGibs, but stored in a map? How does it get populated? How do the payload ibgibs go from the peer to the handle____ methods? So don't do any coding right now. Perhaps this whole conversation will just be you and I talking about the code as I go through it. So just point me to things that you see and I will make changes, because I need to wrap this up in the next 3 days. Do note that I have made some changes since starting this message to you, and it doesn't build at the moment. But overall there are still things that you can just point me to if you just examine the logic.

package/dist/sync/sync-local-spaces.respec.d.mts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=sync-local-spaces.respec.d.mts.map

package/dist/sync/sync-local-spaces.respec.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sync-local-spaces.respec.d.mts","sourceRoot":"","sources":["../../src/sync/sync-local-spaces.respec.mts"],"names":[],"mappings":""}