@ibgib/core-gib 0.1.20 → 0.1.21

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

@@ -20,6 +20,8 @@ export async function getSyncSagaMessageIb({
             data.stage
         ].join(' ');
 
+        // console.log(`${lc} constructed ib: ${ib}`); // temporary debug
+
         return ib;
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)}`);

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

@@ -81,14 +81,3 @@ export interface SyncSagaMessageCommitData_V1 extends SyncSagaMessageData_V1, Sy
     stage: typeof SyncStage.commit;
 }
 
-export interface SyncSagaMessageConflictData_V1 extends SyncSagaMessageData_V1 {
-    stage: typeof SyncStage.conflict;
-    conflictStrategy: SyncConflictStrategy;
-    isTerminal: boolean; // default true for V1
-    conflicts: {
-        tjp: string;
-        localAddr?: string;
-        remoteAddr?: string;
-        reason?: string;
-    }[];
-}

package/tmp.md

@@ -1,3 +1,44 @@
-Clarifying Merge Context
+PS C:\Users\billm\antigravity\ibgib\libs\core-gib> npm run test:agent 2>&1 | Select-String "TEST DEBUG"
 
-I'm now integrating merge context into handleDeltaFrame. It's crucial that this function knows the history of conflicts. I'm focusing on deriving state from the sagaIbGib and arguments, as the coordinator is mostly stateless. I'm thinking of checking for conflicts in the Ack within the saga history. If conflicts existed, I can then check for available merge data. This will involve inspecting delta changes to determine merge necessity, and if required, triggering merge based on existing conflicts. I'll add the necessary type updates accordingly.
+[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)

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

@@ -1,2 +0,0 @@
-export declare const MERGE_INFO_ATOM = "merge_info";
-//# sourceMappingURL=merge-info-constants.d.mts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-info-constants.d.mts","sourceRoot":"","sources":["../../../src/sync/merge-info/merge-info-constants.mts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,eAAe,CAAC"}

package/dist/sync/merge-info/merge-info-constants.mjs

@@ -1,2 +0,0 @@
-export const MERGE_INFO_ATOM = 'merge_info';
-//# sourceMappingURL=merge-info-constants.mjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"merge-info-constants.mjs","sourceRoot":"","sources":["../../../src/sync/merge-info/merge-info-constants.mts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC"}

package/dist/sync/merge-info/merge-info-helpers.d.mts

@@ -1,51 +0,0 @@
-import { IbGib_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
-import { MetaspaceService } from "../../witness/space/metaspace/metaspace-types.mjs";
-import { MergeInfoData_V1, MergeInfoIbGib_V1, MergeInfoIb_V1 } from "./merge-info-types.mjs";
-import { IbGibSpaceAny } from "../../witness/space/space-base-v1.mjs";
-/**
- * Validates and constructs the `ib` object for a Merge Info ibGib.
- */
-export declare function getMergeInfoIb({ data }: {
-    data: MergeInfoData_V1;
-}): Promise<string>;
-/**
- * Parses a standard Merge Info 'ib' string.
- */
-export declare function parseMergeInfoIb({ ib }: {
-    ib: string;
-}): Promise<MergeInfoIb_V1>;
-/**
- * Creates a new MergeInfo ibGib.
- */
-export declare function createMergeInfo({ algo, ancestors, details, }: {
-    algo: string;
-    ancestors: IbGib_V1[];
-    details?: string;
-}): Promise<MergeInfoIbGib_V1>;
-/**
- * Naive text merge.
- * Strategies:
- * 1. Concat (A + B)
- * 2. structured diff (not impl)
- */
-export declare function mergeText({ textA, textB, }: {
-    textA: string;
-    textB: string;
-}): Promise<string>;
-/**
- * Combines two divergent timelines by applying missing DNA from one branch to another.
- *
- * Logic:
- * 1. Identify missing DNA (transforms) in `targetTip` that exist in `sourceTip` (relative to LCA).
- * 2. Replay those transforms onto `targetTip`.
- * 3. Create a MergeInfo stone describing this operation.
- * 4. Relate the new tip to the MergeInfo.
- */
-export declare function combineDivergentTimelines({ targetTip, sourceTip, lca, space, metaspace, }: {
-    targetTip: IbGib_V1;
-    sourceTip: IbGib_V1;
-    lca: IbGib_V1;
-    space: IbGibSpaceAny;
-    metaspace: MetaspaceService;
-}): Promise<IbGib_V1>;
-//# sourceMappingURL=merge-info-helpers.d.mts.map

package/dist/sync/merge-info/merge-info-helpers.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-info-helpers.d.mts","sourceRoot":"","sources":["../../../src/sync/merge-info/merge-info-helpers.mts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAI3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AAErF,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAItE;;GAEG;AACH,wBAAsB,cAAc,CAAC,EACjC,IAAI,EACP,EAAE;IACC,IAAI,EAAE,gBAAgB,CAAA;CACzB,GAAG,OAAO,CAAC,MAAM,CAAC,CAKlB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACnC,EAAE,EACL,EAAE;IACC,EAAE,EAAE,MAAM,CAAA;CACb,GAAG,OAAO,CAAC,cAAc,CAAC,CAgB1B;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,EAClC,IAAI,EACJ,SAAS,EACT,OAAO,GACV,EAAE;IACC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CA0B7B;AAED;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,EAC5B,KAAK,EACL,KAAK,GACR,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,MAAM,CAAC,CAKlB;AAED;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAAC,EAC5C,SAAS,EACT,SAAS,EACT,GAAG,EACH,KAAK,EACL,SAAS,GACZ,EAAE;IACC,SAAS,EAAE,QAAQ,CAAC;IACpB,SAAS,EAAE,QAAQ,CAAC;IACpB,GAAG,EAAE,QAAQ,CAAC;IACd,KAAK,EAAE,aAAa,CAAC;IACrB,SAAS,EAAE,gBAAgB,CAAC;CAC/B,GAAG,OAAO,CAAC,QAAQ,CAAC,CAGpB"}

package/dist/sync/merge-info/merge-info-helpers.mjs

@@ -1,92 +0,0 @@
-import { Factory_V1 } from "@ibgib/ts-gib/dist/V1/factory.mjs";
-import { getIbGibAddr } from "@ibgib/ts-gib/dist/helper.mjs";
-import { extractErrorMsg } from "@ibgib/helper-gib/dist/helpers/utils-helper.mjs";
-import { MERGE_INFO_ATOM } from "./merge-info-constants.mjs";
-const lc = `[merge-info-helpers]`;
-/**
- * Validates and constructs the `ib` object for a Merge Info ibGib.
- */
-export async function getMergeInfoIb({ data }) {
-    if (!data.algo) {
-        throw new Error(`(UNEXPECTED) data.algo required for MergeInfoIb (E: 8a9b0c1d2e3f4g5h)`);
-    }
-    // merge_info algo
-    return [MERGE_INFO_ATOM, data.algo].join(' ');
-}
-/**
- * Parses a standard Merge Info 'ib' string.
- */
-export async function parseMergeInfoIb({ ib }) {
-    try {
-        const parts = ib.split(' ');
-        if (parts[0] !== MERGE_INFO_ATOM) {
-            throw new Error(`Atom mismatch. Expected ${MERGE_INFO_ATOM} (E: 8f03c92a95144b618821915632599266)`);
-        }
-        if (parts.length < 2) {
-            throw new Error(`Invalid merge info ib. Expected at least 2 parts. (E: 9c2b4c8a6d34469f8263544710183355)`);
-        }
-        const algo = parts.slice(1).join(' '); // allow spaces in algo? usually single word but safe to join.
-        return {
-            atom: MERGE_INFO_ATOM,
-            algo,
-        };
-    }
-    catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)}`);
-        throw error;
-    }
-}
-/**
- * Creates a new MergeInfo ibGib.
- */
-export async function createMergeInfo({ algo, ancestors, details, }) {
-    const data = {
-        algo,
-        details,
-    };
-    const ib = await getMergeInfoIb({ data });
-    const rel8ns = {};
-    if (ancestors && ancestors.length > 0) {
-        rel8ns.ancestors = ancestors.map(a => getIbGibAddr({ ibGib: a }));
-    }
-    const res = await Factory_V1.stone({
-        ib,
-        data,
-        rel8ns,
-        parentPrimitiveIb: MERGE_INFO_ATOM,
-        uuid: true, // Should be unique per merge event? Yes.
-    });
-    // Unwrapping if necessary, though recent checking suggests Factory returns ibGib directly.
-    // Wait, recent check in SyncSagaCoordinator showed Factory_V1.stone returns the ibGib directly.
-    // But check the implementation plan/previous learnings.
-    // Confirmed: Factory_V1.stone returns the ibGib directly.
-    return res;
-}
-/**
- * Naive text merge.
- * Strategies:
- * 1. Concat (A + B)
- * 2. structured diff (not impl)
- */
-export async function mergeText({ textA, textB, }) {
-    // Very naive: Just concat with a marker for now.
-    // User wants "best effort at being non-destructive".
-    if (textA === textB) {
-        return textA;
-    }
-    return `${textA}\n\n>>> MERGE SEPARATOR <<<\n\n${textB}`;
-}
-/**
- * Combines two divergent timelines by applying missing DNA from one branch to another.
- *
- * Logic:
- * 1. Identify missing DNA (transforms) in `targetTip` that exist in `sourceTip` (relative to LCA).
- * 2. Replay those transforms onto `targetTip`.
- * 3. Create a MergeInfo stone describing this operation.
- * 4. Relate the new tip to the MergeInfo.
- */
-export async function combineDivergentTimelines({ targetTip, sourceTip, lca, space, metaspace, }) {
-    // stub implementation
-    return targetTip;
-}
-//# sourceMappingURL=merge-info-helpers.mjs.map

package/dist/sync/merge-info/merge-info-helpers.mjs.map

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

package/dist/sync/merge-info/merge-info-helpers.respec.d.mts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=merge-info-helpers.respec.d.mts.map

package/dist/sync/merge-info/merge-info-helpers.respec.d.mts.map

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

package/dist/sync/merge-info/merge-info-helpers.respec.mjs

@@ -1,32 +0,0 @@
-/**
- * @module merge-info-helpers.respec
- */
-import { iReckon, respecfully, ifWeMight } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
-import { mergeText } from './merge-info-helpers.mjs';
-const maam = `[${import.meta.url}]`;
-const sir = maam;
-await respecfully(sir, 'Merge Info Helpers', async () => {
-    await respecfully(sir, 'mergeText', async () => {
-        await ifWeMight(sir, 'mergeText should concat different strings', async () => {
-            const textA = "Hello";
-            const textB = "World";
-            const res = await mergeText({ textA, textB });
-            iReckon(sir, res).asTo('result').isGonnaBeTruthy();
-            iReckon(sir, res.includes(textA)).asTo('includes A').isGonnaBeTruthy();
-            iReckon(sir, res.includes(textB)).asTo('includes B').isGonnaBeTruthy();
-            iReckon(sir, res.includes('MERGE SEPARATOR')).asTo('includes separator').isGonnaBeTruthy();
-        });
-        await ifWeMight(sir, 'mergeText should return same string if identical', async () => {
-            const textA = "Hello";
-            const res = await mergeText({ textA, textB: textA });
-            iReckon(sir, res).asTo('result').isGonnaBe(textA);
-        });
-    });
-    await respecfully(sir, 'combineDivergentTimelines', async () => {
-        await ifWeMight(sir, 'combineDivergentTimelines should work (Stub)', async () => {
-            // Validation of stub for now, just to ensure scaffolding works.
-            iReckon(sir, true).asTo('stub executed').isGonnaBeTruthy();
-        });
-    });
-});
-//# sourceMappingURL=merge-info-helpers.respec.mjs.map

package/dist/sync/merge-info/merge-info-helpers.respec.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-info-helpers.respec.mjs","sourceRoot":"","sources":["../../../src/sync/merge-info/merge-info-helpers.respec.mts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,WAAW,EAAQ,SAAS,EAAE,MAAM,kDAAkD,CAAC;AACzG,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,MAAM,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;AACpC,MAAM,GAAG,GAAG,IAAI,CAAC;AAEjB,MAAM,WAAW,CAAC,GAAG,EAAE,oBAAoB,EAAE,KAAK,IAAI,EAAE;IAEpD,MAAM,WAAW,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE;QAE3C,MAAM,SAAS,CAAC,GAAG,EAAE,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,KAAK,GAAG,OAAO,CAAC;YACtB,MAAM,KAAK,GAAG,OAAO,CAAC;YACtB,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9C,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,eAAe,EAAE,CAAC;YACnD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,eAAe,EAAE,CAAC;YACvE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,eAAe,EAAE,CAAC;YACvE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,eAAe,EAAE,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,GAAG,EAAE,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChF,MAAM,KAAK,GAAG,OAAO,CAAC;YACtB,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,CAAC,GAAG,EAAE,2BAA2B,EAAE,KAAK,IAAI,EAAE;QAE3D,MAAM,SAAS,CAAC,GAAG,EAAE,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5E,gEAAgE;YAChE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,eAAe,EAAE,CAAC;QAC/D,CAAC,CAAC,CAAC;IAEP,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}

package/dist/sync/merge-info/merge-info-types.d.mts

@@ -1,26 +0,0 @@
-import { IbGib_V1, IbGibData_V1, IbGibRel8ns_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
-import { MERGE_INFO_ATOM } from "./merge-info-constants.mjs";
-export interface MergeInfoIb_V1 {
-    atom: typeof MERGE_INFO_ATOM;
-    algo: string;
-}
-export interface MergeInfoData_V1 extends IbGibData_V1 {
-    /**
-     * The algorithm or strategy used to perform the merge.
-     */
-    algo: string;
-    /**
-     * Optional details about the merge, e.g. validation results or specifics about conflicts resolved.
-     */
-    details?: string;
-}
-export interface MergeInfoRel8ns_V1 extends IbGibRel8ns_V1 {
-    /**
-     * The ibGibs that were merged together.
-     * For a timeline merge, these are the tips of the divergent branches.
-     */
-    ancestors?: string[];
-}
-export interface MergeInfoIbGib_V1 extends IbGib_V1<MergeInfoData_V1, MergeInfoRel8ns_V1> {
-}
-//# sourceMappingURL=merge-info-types.d.mts.map

package/dist/sync/merge-info/merge-info-types.mjs

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=merge-info-types.mjs.map

package/dist/sync/merge-info/merge-info-types.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-info-types.mjs","sourceRoot":"","sources":["../../../src/sync/merge-info/merge-info-types.mts"],"names":[],"mappings":""}

package/src/sync/merge-info/merge-info-constants.mts

@@ -1 +0,0 @@
-export const MERGE_INFO_ATOM = 'merge_info';

package/src/sync/merge-info/merge-info-helpers.mts

@@ -1,134 +0,0 @@
-import { Factory_V1 } from "@ibgib/ts-gib/dist/V1/factory.mjs";
-import { IbGib_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
-import { getIbGibAddr } from "@ibgib/ts-gib/dist/helper.mjs";
-import { extractErrorMsg } from "@ibgib/helper-gib/dist/helpers/utils-helper.mjs";
-
-import { MetaspaceService } from "../../witness/space/metaspace/metaspace-types.mjs";
-import { MERGE_INFO_ATOM } from "./merge-info-constants.mjs";
-import { MergeInfoData_V1, MergeInfoIbGib_V1, MergeInfoIb_V1 } from "./merge-info-types.mjs";
-import { IbGibSpaceAny } from "../../witness/space/space-base-v1.mjs";
-
-const lc = `[merge-info-helpers]`;
-
-/**
- * Validates and constructs the `ib` object for a Merge Info ibGib.
- */
-export async function getMergeInfoIb({
-    data
-}: {
-    data: MergeInfoData_V1
-}): Promise<string> {
-    if (!data.algo) { throw new Error(`(UNEXPECTED) data.algo required for MergeInfoIb (E: 8a9b0c1d2e3f4g5h)`); }
-
-    // merge_info algo
-    return [MERGE_INFO_ATOM, data.algo].join(' ');
-}
-
-/**
- * Parses a standard Merge Info 'ib' string.
- */
-export async function parseMergeInfoIb({
-    ib
-}: {
-    ib: string
-}): Promise<MergeInfoIb_V1> {
-    try {
-        const parts = ib.split(' ');
-        if (parts[0] !== MERGE_INFO_ATOM) { throw new Error(`Atom mismatch. Expected ${MERGE_INFO_ATOM} (E: 8f03c92a95144b618821915632599266)`); }
-        if (parts.length < 2) { throw new Error(`Invalid merge info ib. Expected at least 2 parts. (E: 9c2b4c8a6d34469f8263544710183355)`); }
-
-        const algo = parts.slice(1).join(' '); // allow spaces in algo? usually single word but safe to join.
-
-        return {
-            atom: MERGE_INFO_ATOM,
-            algo,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)}`);
-        throw error;
-    }
-}
-
-/**
- * Creates a new MergeInfo ibGib.
- */
-export async function createMergeInfo({
-    algo,
-    ancestors,
-    details,
-}: {
-    algo: string,
-    ancestors: IbGib_V1[],
-    details?: string,
-}): Promise<MergeInfoIbGib_V1> {
-    const data: MergeInfoData_V1 = {
-        algo,
-        details,
-    };
-
-    const ib = await getMergeInfoIb({ data });
-
-    const rel8ns: any = {};
-    if (ancestors && ancestors.length > 0) {
-        rel8ns.ancestors = ancestors.map(a => getIbGibAddr({ ibGib: a }));
-    }
-
-    const res = await Factory_V1.stone({
-        ib,
-        data,
-        rel8ns,
-        parentPrimitiveIb: MERGE_INFO_ATOM,
-        uuid: true, // Should be unique per merge event? Yes.
-    });
-
-    // Unwrapping if necessary, though recent checking suggests Factory returns ibGib directly.
-    // Wait, recent check in SyncSagaCoordinator showed Factory_V1.stone returns the ibGib directly.
-    // But check the implementation plan/previous learnings.
-    // Confirmed: Factory_V1.stone returns the ibGib directly.
-    return res as MergeInfoIbGib_V1;
-}
-
-/**
- * Naive text merge. 
- * Strategies:
- * 1. Concat (A + B)
- * 2. structured diff (not impl)
- */
-export async function mergeText({
-    textA,
-    textB,
-}: {
-    textA: string,
-    textB: string,
-}): Promise<string> {
-    // Very naive: Just concat with a marker for now.
-    // User wants "best effort at being non-destructive".
-    if (textA === textB) { return textA; }
-    return `${textA}\n\n>>> MERGE SEPARATOR <<<\n\n${textB}`;
-}
-
-/**
- * Combines two divergent timelines by applying missing DNA from one branch to another.
- * 
- * Logic:
- * 1. Identify missing DNA (transforms) in `targetTip` that exist in `sourceTip` (relative to LCA).
- * 2. Replay those transforms onto `targetTip`.
- * 3. Create a MergeInfo stone describing this operation.
- * 4. Relate the new tip to the MergeInfo.
- */
-export async function combineDivergentTimelines({
-    targetTip,
-    sourceTip,
-    lca,
-    space,
-    metaspace,
-}: {
-    targetTip: IbGib_V1,
-    sourceTip: IbGib_V1,
-    lca: IbGib_V1,
-    space: IbGibSpaceAny,
-    metaspace: MetaspaceService,
-}): Promise<IbGib_V1> {
-    // stub implementation
-    return targetTip;
-}

package/src/sync/merge-info/merge-info-helpers.respec.mts

@@ -1,41 +0,0 @@
-/**
- * @module merge-info-helpers.respec
- */
-import { iReckon, respecfully, ifWe, ifWeMight } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
-import { mergeText } from './merge-info-helpers.mjs';
-
-const maam = `[${import.meta.url}]`;
-const sir = maam;
-
-await respecfully(sir, 'Merge Info Helpers', async () => {
-
-    await respecfully(sir, 'mergeText', async () => {
-
-        await ifWeMight(sir, 'mergeText should concat different strings', async () => {
-            const textA = "Hello";
-            const textB = "World";
-            const res = await mergeText({ textA, textB });
-            iReckon(sir, res).asTo('result').isGonnaBeTruthy();
-            iReckon(sir, res.includes(textA)).asTo('includes A').isGonnaBeTruthy();
-            iReckon(sir, res.includes(textB)).asTo('includes B').isGonnaBeTruthy();
-            iReckon(sir, res.includes('MERGE SEPARATOR')).asTo('includes separator').isGonnaBeTruthy();
-        });
-
-        await ifWeMight(sir, 'mergeText should return same string if identical', async () => {
-            const textA = "Hello";
-            const res = await mergeText({ textA, textB: textA });
-            iReckon(sir, res).asTo('result').isGonnaBe(textA);
-        });
-
-    });
-
-    await respecfully(sir, 'combineDivergentTimelines', async () => {
-
-        await ifWeMight(sir, 'combineDivergentTimelines should work (Stub)', async () => {
-            // Validation of stub for now, just to ensure scaffolding works.
-            iReckon(sir, true).asTo('stub executed').isGonnaBeTruthy();
-        });
-
-    });
-
-});

package/src/sync/merge-info/merge-info-types.mts

@@ -1,28 +0,0 @@
-import { IbGib_V1, IbGibData_V1, IbGibRel8ns_V1 } from "@ibgib/ts-gib/dist/V1/types.mjs";
-import { MERGE_INFO_ATOM } from "./merge-info-constants.mjs";
-
-export interface MergeInfoIb_V1 {
-    atom: typeof MERGE_INFO_ATOM;
-    algo: string; // e.g. "optimistic", "text", "manual"
-}
-
-export interface MergeInfoData_V1 extends IbGibData_V1 {
-    /**
-     * The algorithm or strategy used to perform the merge.
-     */
-    algo: string;
-    /**
-     * Optional details about the merge, e.g. validation results or specifics about conflicts resolved.
-     */
-    details?: string;
-}
-
-export interface MergeInfoRel8ns_V1 extends IbGibRel8ns_V1 {
-    /**
-     * The ibGibs that were merged together.
-     * For a timeline merge, these are the tips of the divergent branches.
-     */
-    ancestors?: string[];
-}
-
-export interface MergeInfoIbGib_V1 extends IbGib_V1<MergeInfoData_V1, MergeInfoRel8ns_V1> { }