@ibgib/vcs-gib 0.0.6 → 0.0.18

package/dist/engine/merge/b2tfs-merge-strategy.respec.mjs

@@ -0,0 +1,335 @@
+/**
+ * @module b2tfs-merge-strategy.respec.node
+ *
+ * In-memory respec unit tests for B2tFSItem3WayMergeStrategy.
+ */
+import { respecfully, ifWe, iReckon } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
+import { hash } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { InnerSpace_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-v1.mjs';
+import { DEFAULT_INNER_SPACE_DATA_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-types.mjs';
+import { persistTransformResult, registerNewIbGib, getFromSpace, putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { graftTimelines } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-helpers.mjs';
+import { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
+import { GraftPreference } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs';
+import { getBinIb } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
+import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../item/item-helper.mjs';
+import { BINARY_REL8N_NAME, B2TFS_CHILD_ITEM_REL8N_NAME } from '../item/item-types.mjs';
+import { B2tFS3WayGraftStrategy, B2tFSItem3WayMergeStrategy } from './b2tfs-3way-merge-strategy.mjs';
+const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-merge-strategy.respec.node.mts]`;
+function binDataToText(data) {
+    if (!data) {
+        return '';
+    }
+    if (typeof data === 'string') {
+        return data;
+    }
+    if (typeof data.text === 'string') {
+        return data.text;
+    }
+    if (typeof data.data === 'string') {
+        return data.data;
+    }
+    if (data instanceof Uint8Array || Buffer.isBuffer(data)) {
+        return new TextDecoder('utf8').decode(data);
+    }
+    if (typeof data === 'object') {
+        const vals = Object.values(data);
+        const bytes = new Uint8Array(vals);
+        return new TextDecoder('utf8').decode(bytes);
+    }
+    return String(data);
+}
+async function createFileWithContent({ name, content, space, }) {
+    const textStr = typeof content === 'string' ? content : new TextDecoder('utf8').decode(content);
+    const dataBuffer = typeof content === 'string' ? Buffer.from(content, 'utf8') : content;
+    const fileHash = await hash({ s: textStr });
+    const fileExt = name.includes('.') ? name.split('.').pop() || 'txt' : 'txt';
+    const binIb = getBinIb({
+        binHash: fileHash,
+        binExt: fileExt,
+        binEncoding: 'utf8',
+    });
+    const binIbGib = {
+        ib: binIb,
+        data: dataBuffer,
+    };
+    binIbGib.gib = await getGib({ ibGib: binIbGib, hasTjp: false });
+    const binAddr = getIbGibAddr({ ibGib: binIbGib });
+    await putInSpace({ ibGib: binIbGib, space });
+    await registerNewIbGib({ ibGib: binIbGib, space });
+    const itemRes = await createB2tFSItemIbGib({
+        fsType: 'file',
+        name,
+        rel8ns: {
+            [BINARY_REL8N_NAME]: [binAddr],
+        },
+    });
+    await persistTransformResult({ resTransform: itemRes, space });
+    await registerNewIbGib({ ibGib: itemRes.newIbGib, space });
+    return itemRes.newIbGib;
+}
+async function evolveFileContent({ existingItem, newContent, space, }) {
+    const textStr = typeof newContent === 'string' ? newContent : new TextDecoder('utf8').decode(newContent);
+    const dataBuffer = typeof newContent === 'string' ? Buffer.from(newContent, 'utf8') : newContent;
+    const fileHash = await hash({ s: textStr });
+    const fileExt = existingItem.data?.fileExt || (existingItem.data?.name?.includes('.') ? existingItem.data.name.split('.').pop() || 'txt' : 'txt');
+    const binIb = getBinIb({
+        binHash: fileHash,
+        binExt: fileExt,
+        binEncoding: 'utf8',
+    });
+    const binIbGib = {
+        ib: binIb,
+        data: dataBuffer,
+    };
+    binIbGib.gib = await getGib({ ibGib: binIbGib, hasTjp: false });
+    const binAddr = getIbGibAddr({ ibGib: binIbGib });
+    await putInSpace({ ibGib: binIbGib, space });
+    await registerNewIbGib({ ibGib: binIbGib, space });
+    const evolveRes = await evolveB2tFSItemIbGib({
+        existingItem,
+        rel8nsToUpdate: {
+            [BINARY_REL8N_NAME]: [binAddr],
+        },
+    });
+    await persistTransformResult({ resTransform: evolveRes, space });
+    await registerNewIbGib({ ibGib: evolveRes.newIbGib, space });
+    return evolveRes.newIbGib;
+}
+async function createFolderItem({ name, childAddrs, space, }) {
+    const res = await createB2tFSItemIbGib({
+        fsType: 'folder',
+        name,
+        rel8ns: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
+        },
+    });
+    await persistTransformResult({ resTransform: res, space });
+    await registerNewIbGib({ ibGib: res.newIbGib, space });
+    return res.newIbGib;
+}
+async function evolveFolderItem({ existingItem, childAddrs, space, }) {
+    const res = await evolveB2tFSItemIbGib({
+        existingItem,
+        rel8nsToUpdate: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
+        },
+        rel8nsToRemove: {
+            [B2TFS_CHILD_ITEM_REL8N_NAME]: existingItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [],
+        },
+    });
+    await persistTransformResult({ resTransform: res, space });
+    await registerNewIbGib({ ibGib: res.newIbGib, space });
+    return res.newIbGib;
+}
+await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () => {
+    await ifWe(lc, `performs non-conflicting line merges across two branch timelines`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_1',
+            uuid: 'test_space_uuid_1',
+        });
+        await space.initialized;
+        const initialText = "line 1\nline 2\nline 3";
+        const lcaFile = await createFileWithContent({ name: 'app.ts', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+        // Base branch modifies line 1
+        const baseText = "line 1 modified by base\nline 2\nline 3";
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+        // Orphan branch modifies line 3
+        const orphanText = "line 1\nline 2\nline 3 modified by orphan";
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const graftResult = await graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            strategies: [new B2tFSItem3WayMergeStrategy()],
+        });
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
+        const mergedFolder = tipGet.ibGibs[0];
+        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
+        iReckon(lc, mergedChildAddr).isGonnaBeTruthy();
+        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr] });
+        const mergedFile = fileGet.ibGibs[0];
+        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
+        iReckon(lc, binAddr).isGonnaBeTruthy();
+        const binGet = await getFromSpace({ space, addrs: [binAddr] });
+        const binIbGib = binGet.ibGibs[0];
+        const text = binDataToText(binIbGib.data);
+        iReckon(lc, text).includes('line 1 modified by base');
+        iReckon(lc, text).includes('line 2');
+        iReckon(lc, text).includes('line 3 modified by orphan');
+    });
+    await ifWe(lc, `inserts Git conflict markers on conflicting text line merges`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_2',
+            uuid: 'test_space_uuid_2',
+        });
+        await space.initialized;
+        const initialText = "line 1\nline 2\nline 3";
+        const lcaFile = await createFileWithContent({ name: 'index.ts', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+        // Base modifies line 2
+        const baseText = "line 1\nline 2 base edit\nline 3";
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+        // Orphan modifies line 2 differently
+        const orphanText = "line 1\nline 2 orphan edit\nline 3";
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const graftResult = await graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            strategies: [new B2tFSItem3WayMergeStrategy()],
+        });
+        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
+        const mergedFolder = tipGet.ibGibs[0];
+        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
+        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr] });
+        const mergedFile = fileGet.ibGibs[0];
+        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
+        const binGet = await getFromSpace({ space, addrs: [binAddr] });
+        const binIbGib = binGet.ibGibs[0];
+        const text = binDataToText(binIbGib.data);
+        iReckon(lc, text).includes('<<<<<<< HEAD');
+        iReckon(lc, text).includes('line 2 base edit');
+        iReckon(lc, text).includes('=======');
+        iReckon(lc, text).includes('line 2 orphan edit');
+        iReckon(lc, text).includes('>>>>>>>');
+    });
+    await ifWe(lc, `skips line diff merging for non-text binary files`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_3',
+            uuid: 'test_space_uuid_3',
+        });
+        await space.initialized;
+        const lcaBinData = new Uint8Array([0x00, 0x01, 0x02, 0x03]);
+        const lcaFile = await createFileWithContent({ name: 'image.png', content: lcaBinData, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'assets', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+        const baseBinData = new Uint8Array([0x00, 0x01, 0x02, 0x04]);
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseBinData, space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+        const orphanBinData = new Uint8Array([0x00, 0x01, 0x02, 0x05]);
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanBinData, space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+        const timelineA = [lcaFolderAddr, baseFolderAddr];
+        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const graftResult = await graftTimelines({
+            timelineAddrsA: timelineA,
+            timelineAddrsB: timelineB,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            strategies: [new B2tFS3WayGraftStrategy()],
+        });
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+    });
+    await ifWe(lc, `respects GraftPreference.receiver by using timelineB (receiver) as baseTip`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_4',
+            uuid: 'test_space_uuid_4',
+        });
+        await space.initialized;
+        const initialText = "base content";
+        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "base edit", space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "orphan edit", space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
+        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+        const graftResult = await graftTimelines({
+            timelineAddrsA: timelineA_sender,
+            timelineAddrsB: timelineB_receiver,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            graftPreference: GraftPreference.receiver,
+            strategies: [new B2tFS3WayGraftStrategy()],
+        });
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(orphanFolderAddr);
+    });
+    await ifWe(lc, `respects GraftPreference.sender by using timelineA (sender) as baseTip`, async () => {
+        const space = new InnerSpace_V1({
+            ...DEFAULT_INNER_SPACE_DATA_V1,
+            name: 'test_space_5',
+            uuid: 'test_space_uuid_5',
+        });
+        await space.initialized;
+        const initialText = "base content";
+        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
+        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
+        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
+        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
+        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "sender edit", space });
+        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
+        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
+        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
+        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "receiver edit", space });
+        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
+        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
+        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
+        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
+        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+        const graftResult = await graftTimelines({
+            timelineAddrsA: timelineA_sender,
+            timelineAddrsB: timelineB_receiver,
+            latestCommonFrameAddr: lcaFolderAddr,
+            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
+            ibGibReadCache: {},
+            space,
+            graftPreference: GraftPreference.sender,
+            strategies: [new B2tFS3WayGraftStrategy()],
+        });
+        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(baseFolderAddr);
+    });
+});
+//# sourceMappingURL=b2tfs-merge-strategy.respec.mjs.map

package/dist/engine/merge/b2tfs-merge-strategy.respec.mjs.map

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

package/dist/respec-gib.node.mjs

@@ -5,7 +5,7 @@
  */
 import { RespecNodeRunner } from '@ibgib/helper-gib/dist/respec-gib/respec-node-runner.mjs';
 const runner = new RespecNodeRunner({
-    respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
+// respecFileRegExp: /^.+(?:respec|respec\.node)\.mjs$/,
 });
 await runner.run();
 //# sourceMappingURL=respec-gib.node.mjs.map

package/dist/respec-gib.node.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"respec-gib.node.mjs","sourceRoot":"","sources":["../src/respec-gib.node.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0DAA0D,CAAC;AAE5F,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC;IAChC,gBAAgB,EAAE,kCAAkC;CACvD,CAAC,CAAC;AACH,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC"}
+{"version":3,"file":"respec-gib.node.mjs","sourceRoot":"","sources":["../src/respec-gib.node.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0DAA0D,CAAC;AAE5F,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC;AAChC,wDAAwD;CAC3D,CAAC,CAAC;AACH,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC"}

package/dist/{vcs-gib.respec.node.d.mts → vcs-gib.respec.d.mts}

@@ -5,4 +5,4 @@
  * Tests Metaspace bootstrap, canonical ib atoms, item creation, branch spaces, and index tracking.
  */
 export {};
-//# sourceMappingURL=vcs-gib.respec.node.d.mts.map
+//# sourceMappingURL=vcs-gib.respec.d.mts.map

package/dist/vcs-gib.respec.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vcs-gib.respec.d.mts","sourceRoot":"","sources":["../src/vcs-gib.respec.mts"],"names":[],"mappings":"AAAA;;;;;GAKG"}

package/dist/{vcs-gib.respec.node.mjs → vcs-gib.respec.mjs}

@@ -79,4 +79,4 @@ await respecfully(lc, `vcs-gib Full Engine Cycle`, async () => {
         });
     });
 });
-//# sourceMappingURL=vcs-gib.respec.node.mjs.map
+//# sourceMappingURL=vcs-gib.respec.mjs.map

package/dist/vcs-gib.respec.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/vcs-gib",
-  "version": "0.0.6",
+  "version": "0.0.18",
   "private": false,
   "type": "module",
   "main": "dist/index.mjs",
@@ -22,7 +22,7 @@
     "@ibgib/helper-gib": "^0.0.36",
     "@ibgib/ts-gib": "^0.5.33",
     "@ibgib/encrypt-gib": "^0.2.37",
-    "@ibgib/core-gib": "^0.1.69",
-    "@ibgib/node-gib": "^0.0.13"
+    "@ibgib/core-gib": "^0.1.71",
+    "@ibgib/node-gib": "^0.0.15"
   }
 }

package/src/AUTO-GENERATED-version.mts

@@ -2,4 +2,4 @@
  * @module AUTO-GENERATED-version
  * Auto-generated version constant. Do NOT edit directly.
  */
-export const AUTO_GENERATED_VERSION = '0.0.6';
+export const AUTO_GENERATED_VERSION = '0.0.18';

package/src/bootstrap/node-bootstrap.mts

@@ -12,12 +12,14 @@ import { clone, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
 import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
 import { updateBootstrapIbGib } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { registerGraftStrategy } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-helpers.mjs';
 import { Metaspace_Nodespace } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace.mjs';
 import { NodeFilesystemSpace_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-v1.mjs';
 import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-types.mjs';
 import { fnCreateNewLocalSpace, fnDtoToSpace_nodeFilesystem } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
+import { B2tFS3WayGraftStrategy } from '../engine/merge/b2tfs-3way-merge-strategy.mjs';
 
 const lcFile = `[node-bootstrap]`;
 const logalot = GLOBAL_LOG_A_LOT;
@@ -55,6 +57,8 @@ export async function bootstrapVcsMetaspace(
     const lc = `${lcFile}[${bootstrapVcsMetaspace.name}]`;
     try {
         if (logalot) { console.log(`${lc} starting... (I: 9f8a0b1c2d3e4f5a6b7c8d9e0f1a2b3c)`); }
+        registerGraftStrategy(new B2tFS3WayGraftStrategy());
+
         const {
             repoPath = process.cwd(),
             vcsFolderName = '.vcsgib',
@@ -131,6 +135,7 @@ export async function bootstrapVcsMetaspace(
                     return zeroSpace;
                 },
                 fnDefaultLocalSpaceFactory: async (spaceOpts) => {
+                    if (spaceOpts) { (spaceOpts as any).baseDir = vcsPath; }
                     const space = await fnCreateNewLocalSpace(spaceOpts);
                     if (space && space.data) {
                         space.data.baseDir = vcsPath;
@@ -139,6 +144,7 @@ export async function bootstrapVcsMetaspace(
                     return space;
                 },
                 fnDtoToSpace: async (spaceDto) => {
+                    if (spaceDto && spaceDto.data) { spaceDto.data.baseDir = vcsPath; }
                     const space = await fnDtoToSpace_nodeFilesystem(spaceDto);
                     if (space && space.data) {
                         space.data.baseDir = vcsPath;

package/src/cli/cli-arg-parser.mts

@@ -15,6 +15,9 @@ import {
     VCS_PARAM_VERBOSE,
     VCS_PARAM_HELP,
     VCS_PARAM_SHARE_IGNORED,
+    VCS_PARAM_YES,
+    VCS_PARAM_STAGED,
+    VCS_PARAM_WORKTREE,
 } from './cli-constants.mjs';
 
 export type VcsSubcommand = typeof VCS_SUBCOMMANDS[keyof typeof VCS_SUBCOMMANDS];
@@ -30,6 +33,9 @@ export interface ParsedVcsArgs {
         verbose?: boolean;
         help?: boolean;
         shareIgnored?: boolean;
+        yes?: boolean;
+        staged?: boolean;
+        worktree?: boolean;
     };
     rawArgs: string[];
 }
@@ -89,6 +95,15 @@ export function parseVcsArgs(argv: string[]): ParsedVcsArgs {
         } else if (matchesParam(arg, VCS_PARAM_SHARE_IGNORED)) {
             flags.shareIgnored = true;
             i++;
+        } else if (matchesParam(arg, VCS_PARAM_YES)) {
+            flags.yes = true;
+            i++;
+        } else if (matchesParam(arg, VCS_PARAM_STAGED)) {
+            flags.staged = true;
+            i++;
+        } else if (matchesParam(arg, VCS_PARAM_WORKTREE)) {
+            flags.worktree = true;
+            i++;
         } else if (!arg.startsWith('-')) {
             if (command === VCS_SUBCOMMANDS.HELP) {
                 const normalized = arg.toLowerCase();

package/src/cli/cli-constants.mts

@@ -16,6 +16,9 @@ export const VCS_SUBCOMMANDS = {
     LOG: 'log',
     BRANCH: 'branch',
     CHECKOUT: 'checkout',
+    MERGE: 'merge',
+    RESET: 'reset',
+    RESTORE: 'restore',
     HELP: 'help',
     VERSION: 'version',
 } as const;
@@ -75,3 +78,27 @@ export const VCS_PARAM_SHARE_IGNORED: RCLIParamInfo = {
     isFlag: true,
     argTypeName: 'boolean',
 };
+
+export const VCS_PARAM_YES: RCLIParamInfo = {
+    name: 'yes',
+    synonyms: ['y'],
+    description: 'Automatically confirm prompt',
+    isFlag: true,
+    argTypeName: 'boolean',
+};
+
+export const VCS_PARAM_STAGED: RCLIParamInfo = {
+    name: 'staged',
+    synonyms: ['s'],
+    description: 'Unstage specified files from index',
+    isFlag: true,
+    argTypeName: 'boolean',
+};
+
+export const VCS_PARAM_WORKTREE: RCLIParamInfo = {
+    name: 'worktree',
+    synonyms: ['w'],
+    description: 'Revert physical working tree files',
+    isFlag: true,
+    argTypeName: 'boolean',
+};

package/src/cli/{cli-e2e.respec.node.mts → cli-e2e.respec.mts}

@@ -9,7 +9,7 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 
 import {
-    respecfully, ifWe, iReckon
+    respecfully, ifWe, ifWeMight, iReckon
 } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 
 import { main } from './vcs-cli-main.mjs';
@@ -37,7 +37,7 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
             if (msg.includes('Decentralized Version Control System')) {
                 helpCalled = true;
             }
-            if (msg.includes('@ibgib/vcs-gib v0.0.4')) {
+            if (msg.includes('@ibgib/vcs-gib v')) {
                 versionCalled = true;
             }
         };