@ibgib/vcs-gib 0.0.21 → 0.0.26

package/dist/test/test-helpers.mjs

@@ -0,0 +1,135 @@
+/**
+ * @module test-helpers
+ *
+ * Pure-function diagnostic helpers for logging and inspecting b2tfs ibgib
+ * state during tests. These are NOT production code — they are imported only
+ * by test files (*.respec.mts) and the handful of vcs-gib commands that
+ * temporarily wire in diagnostic logging.
+ *
+ * Usage pattern:
+ *
+ * ```ts
+ * import { logBranchState, logItemState } from '../../test/test-helpers.mjs';
+ * await logBranchState({ label: 'after commit', branchIbGib, space });
+ * ```
+ */
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+// ─────────────────────────────────────────────────────────────────────────────
+// Internal helpers
+// ─────────────────────────────────────────────────────────────────────────────
+function shortAddr(addr) {
+    if (!addr) {
+        return '(none)';
+    }
+    // show the first 12 chars of the gib portion for easy visual matching
+    const caretIdx = addr.lastIndexOf('^');
+    if (caretIdx === -1) {
+        return addr.slice(0, 40);
+    }
+    const ib = addr.slice(0, caretIdx);
+    const gib = addr.slice(caretIdx + 1);
+    // gib may be punctiliarHash.tjpGib  — show first 8 of each
+    const dotIdx = gib.indexOf('.');
+    const gibShort = dotIdx === -1
+        ? gib.slice(0, 8)
+        : `${gib.slice(0, 8)}.${gib.slice(dotIdx + 1, dotIdx + 9)}`;
+    return `${ib}^${gibShort}`;
+}
+function shortAddrs(addrs) {
+    if (!addrs || addrs.length === 0) {
+        return '[]';
+    }
+    return `[\n    ${addrs.map(shortAddr).join('\n    ')}\n  ]`;
+}
+// ─────────────────────────────────────────────────────────────────────────────
+// Exported diagnostic helpers
+// ─────────────────────────────────────────────────────────────────────────────
+/**
+ * Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
+ * b2tfs_item timeline as known by the given space.
+ */
+export async function logBranchState({ label, branchIbGib, space, }) {
+    const lc = `[logBranchState][${label}]`;
+    if (!branchIbGib) {
+        console.log(`${lc} branchIbGib: (UNDEFINED)`);
+        return;
+    }
+    const b = branchIbGib;
+    const addr = getIbGibAddr({ ibGib: b });
+    const n = b.data?.n ?? '?';
+    const name = b.data?.name ?? '?';
+    const tjpAddr = b.rel8ns?.tjp?.at(0);
+    const itemAddrs = b.rel8ns?.b2tfs_item ?? [];
+    console.log(`${lc}
+  addr      : ${shortAddr(addr)}
+  name      : ${name}
+  n         : ${n}
+  tjp       : ${shortAddr(tjpAddr)}
+  b2tfs_item: ${shortAddrs(itemAddrs)} (${itemAddrs.length} total, tip: ${shortAddr(itemAddrs.at(-1))})`);
+    if (space && tjpAddr) {
+        try {
+            const res = await getLatestAddrs({ addrs: [tjpAddr], space });
+            const latest = res?.data?.latestAddrs?.[0];
+            console.log(`  [space ${space.ib ?? space.constructor.name}] latestAddr for branch TJP: ${shortAddr(latest)}`);
+        }
+        catch (e) {
+            console.log(`  [space] getLatestAddrs for branch TJP THREW: ${e}`);
+        }
+    }
+}
+/**
+ * Logs a compact snapshot of a b2tfs item ibgib and optionally the latest addr
+ * for its timeline as known by the given space.
+ */
+export async function logItemState({ label, itemIbGib, space, }) {
+    const lc = `[logItemState][${label}]`;
+    if (!itemIbGib) {
+        console.log(`${lc} itemIbGib: (UNDEFINED)`);
+        return;
+    }
+    const item = itemIbGib;
+    const addr = getIbGibAddr({ ibGib: item });
+    const n = item.data?.n ?? '?';
+    const fsType = item.data?.fsType ?? '?';
+    const filename = item.data?.filename ?? item.data?.name ?? '?';
+    const tjpAddr = item.rel8ns?.tjp?.at(0);
+    const textContent = item.data?.textContent;
+    const binRel8n = item.rel8ns?.bin ?? item.rel8ns?.binary;
+    console.log(`${lc}
+  addr      : ${shortAddr(addr)}
+  filename  : ${filename}  fsType: ${fsType}
+  n         : ${n}
+  tjp       : ${shortAddr(tjpAddr)}
+  text      : ${textContent !== undefined ? JSON.stringify(textContent.slice(0, 120)) : binRel8n ? `(binary, bin rel8n: ${shortAddrs(binRel8n)})` : '(none)'}`);
+    if (space && tjpAddr) {
+        try {
+            const res = await getLatestAddrs({ addrs: [tjpAddr], space });
+            const latest = res?.data?.latestAddrs?.[0];
+            console.log(`  [space ${space.ib ?? space.constructor.name}] latestAddr for item TJP: ${shortAddr(latest)}`);
+        }
+        catch (e) {
+            console.log(`  [space] getLatestAddrs for item TJP THREW: ${e}`);
+        }
+    }
+}
+/**
+ * Logs a one-line separator to make log sections visually scannable.
+ */
+export function logCheckpoint(label) {
+    const bar = '─'.repeat(60);
+    console.log(`\n${bar}\n  CHECKPOINT: ${label}\n${bar}`);
+}
+/**
+ * Logs the full addr (no shortening) for debugging addr comparison issues.
+ */
+export function logAddr(label, addr) {
+    console.log(`[ADDR][${label}]: ${addr ?? '(undefined)'}`);
+}
+/**
+ * Logs a set of addrs with short formatting.
+ */
+export function logAddrs(label, addrs) {
+    console.log(`[ADDRS][${label}]: ${shortAddrs(addrs)}`);
+}
+//# sourceMappingURL=test-helpers.mjs.map

package/dist/test/test-helpers.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/vcs-gib",
-  "version": "0.0.21",
+  "version": "0.0.26",
   "private": false,
   "type": "module",
   "main": "dist/index.mjs",
@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@ibgib/helper-gib": "^0.0.37",
-    "@ibgib/ts-gib": "^0.5.33",
+    "@ibgib/ts-gib": "^0.5.34",
     "@ibgib/encrypt-gib": "^0.3.1",
-    "@ibgib/core-gib": "^0.1.73",
-    "@ibgib/node-gib": "^0.0.18"
+    "@ibgib/core-gib": "^0.1.75",
+    "@ibgib/node-gib": "^0.0.20"
   }
 }

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.21';
+export const AUTO_GENERATED_VERSION = '0.0.26';

package/src/bootstrap/node-bootstrap.mts

@@ -19,7 +19,7 @@ import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witn
 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';
+import { B2tFS3WayGraftStrategy } from '../engine/merge/b2tfs-3way-graft-strategy.mjs';
 
 const lcFile = `[node-bootstrap]`;
 const logalot = GLOBAL_LOG_A_LOT;

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

@@ -18,6 +18,7 @@ import {
     VCS_PARAM_YES,
     VCS_PARAM_STAGED,
     VCS_PARAM_WORKTREE,
+    VCS_PARAM_COMMENTS,
 } from './cli-constants.mjs';
 
 export type VcsSubcommand = typeof VCS_SUBCOMMANDS[keyof typeof VCS_SUBCOMMANDS];
@@ -36,6 +37,7 @@ export interface ParsedVcsArgs {
         yes?: boolean;
         staged?: boolean;
         worktree?: boolean;
+        comments?: boolean;
     };
     rawArgs: string[];
 }
@@ -104,6 +106,9 @@ export function parseVcsArgs(argv: string[]): ParsedVcsArgs {
         } else if (matchesParam(arg, VCS_PARAM_WORKTREE)) {
             flags.worktree = true;
             i++;
+        } else if (matchesParam(arg, VCS_PARAM_COMMENTS)) {
+            flags.comments = true;
+            i++;
         } else if (!arg.startsWith('-')) {
             if (command === VCS_SUBCOMMANDS.HELP) {
                 const normalized = arg.toLowerCase();

package/src/cli/cli-constants.mts

@@ -19,10 +19,23 @@ export const VCS_SUBCOMMANDS = {
     MERGE: 'merge',
     RESET: 'reset',
     RESTORE: 'restore',
+    GENERATE_COMMENT: 'generate-comment',
+    GEN_COMMENT: 'gen-comment',
+    GEN_MSG: 'gen-msg',
+    GCOMM: 'gcomm',
+    GMSG: 'gmsg',
     HELP: 'help',
     VERSION: 'version',
 } as const;
 
+export const VCS_PARAM_COMMENTS: RCLIParamInfo = {
+    name: 'comments',
+    synonyms: ['c'],
+    description: 'Show full pending comment texts in status',
+    isFlag: true,
+    argTypeName: 'boolean',
+};
+
 export const VCS_PARAM_MESSAGE: RCLIParamInfo = {
     name: 'message',
     synonyms: ['m'],

package/src/cli/commands/add-cmd.mts

@@ -20,6 +20,7 @@ import { putInSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
+import { isCommentMetadataFilename } from '../../engine/status/status-helper.mjs';
 import { getB2tFSItemIb } from '../../engine/item/item-atom-helper.mjs';
 import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
 import { getIbGibWithMetaspaceFallback, createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../../engine/item/item-helper.mjs';
@@ -186,7 +187,7 @@ export async function executeAddCmd({
                         throw new Error(`No files matched glob pattern: ${relOrAbs} (E: e23d4c5f6a7b8c9d0e1f2a3b4c5d6e7f)`);
                     }
                 } else {
-                    const fullPath = path.resolve(targetDir, relOrAbs);
+                    const fullPath = path.isAbsolute(relOrAbs) ? relOrAbs : path.resolve(absTargetDir, relOrAbs);
                     let stat;
                     try {
                         stat = await fs.stat(fullPath);
@@ -420,7 +421,9 @@ async function addCmd_collectFilesRecursively({
                 outFiles,
             });
         } else if (entry.isFile()) {
-            outFiles.push(fullPath);
+            if (!isCommentMetadataFilename(entry.name)) {
+                outFiles.push(fullPath);
+            }
         }
     }
 }

package/src/cli/commands/branch-checkout-cmd.respec.log

@@ -1,111 +1,18 @@
-filteredRespecPaths for extra respec: C:\Users\billm\antigravity\ibgib\apps\vcs-gib\dist\cli\commands\branch-checkout-cmd.respec.mjs
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
+PS C:\Users\billm\antigravity\ibgib> npm run test:vcs-gib > vcs-gib-test.log
 [branch-cmd][executeBranchCmd] Branch 'feature-auth' already exists (E: 7f6a5b4c3d2e1f0a9b8c7d6e5f4a3b2c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
 [checkout-cmd][executeCheckoutCmd] Branch name is required for checkout (E: 4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
 [checkout-cmd][executeCheckoutCmd] Branch 'non-existent-branch' does not exist (E: 7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
 [branch-cmd][executeBranchCmd] Item 'src/utils/non-existent.js' not found in active branch snapshot (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) from space (witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] file: app.ts
-[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textLCA:
-line 1
-line 2
-line 3
-[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textBase:
-line 1 modified by main
-line 2
-line 3
-[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textOrphan:
-line 1
-line 2
-line 3 modified by secondary
-[DEBUG 3WAY] textLCA: "line 1\nline 2\nline 3"
-[DEBUG 3WAY] textBase: "line 1 modified by main\nline 2\nline 3"
-[DEBUG 3WAY] textOrphan: "line 1\nline 2\nline 3 modified by secondary"
-[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] mergedText:
-line 1 modified by main
-line 2
-line 3 modified by secondary
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 tmp_sync_recv_8824a3c1 4aae17ecb57f9c235a33ec106e718f0d763509b8ab4e4aa580b344a5a0fb419d undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
+[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) from space (witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
 [SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
-[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
-[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ALL 3 of 3 reckonings were respecful
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates]
-ALL 9 of 9 reckonings were respecful
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ALL 15 of 15 reckonings were respecful
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ALL 4 of 4 reckonings were respecful
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ALL 3 of 3 reckonings were respecful
-💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on checkout] ALL 6 of 6 reckonings were respecful
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^6F40767E6A17082316510C68CCBEE7CCB43B803EF8DE7C4B378D91F5BED745E6.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^6F40767E6A17082316510C68CCBEE7CCB43B803EF8DE7C4B378D91F5BED745E6.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^DBD0E2D09136F8F5A35036656D8BEF33CF70F4050C73BA7AAD1787E87A7BEB15.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^DBD0E2D09136F8F5A35036656D8BEF33CF70F4050C73BA7AAD1787E87A7BEB15.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C4054DC802F94A59398CCFD06453B265F2A3DEEDC637D9670CE16C3293C6B1AC.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C4054DC802F94A59398CCFD06453B265F2A3DEEDC637D9670CE16C3293C6B1AC.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 5eba6ce1c88e7e09c146f83d88d91c5031f21ff7b987806d52d7e56dbe41190a undefined undefined (W: 057baadca494473dabb26fb4fb879774)
+[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 5eba6ce1c88e7e09c146f83d88d91c5031f21ff7b987806d52d7e56dbe41190a undefined undefined (W: 057baadca494473dabb26fb4fb879774)
 💔 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch][includes] Uh oh. this.value (line 1 modified by main
 line 2
 line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
-line 2
-line 2
-line 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-line 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-line 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-line 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-line 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
-line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
-[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ✅
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates] ✅[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ✅
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅      [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ✅        [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
-checkout] ✅
-  [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥       4 respec files completely skipped.
+14 respec files completely skipped.
+💔💔 DISrespec found 💔💔
   [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers] DISrespec 💔

package/src/cli/commands/branch-checkout-cmd.respec.mts

@@ -19,12 +19,13 @@ import { executeBranchCmd } from './branch-cmd.mjs';
 import { executeCheckoutCmd } from './checkout-cmd.mjs';
 import { executeMergeCmd } from './merge-cmd.mjs';
 import { executeStatusCmd } from './status-cmd.mjs';
+import { logCheckpoint } from '../../test/test-helpers.mjs';
 
 const lc = `[apps/vcs-gib/src/cli/commands/branch-checkout-cmd.respec.node.mts]`;
 
 await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async () => {
 
-    await ifWeMight(lc, `lists default branch main for new repository`, async () => {
+    await ifWe(lc, `lists default branch main for new repository`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_1');
         const vcsFolderName = '.vcsgib_test_bc_1';
         try {
@@ -48,7 +49,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `creates new branch from active branch root item and rejects duplicates`, async () => {
+    await ifWe(lc, `creates new branch from active branch root item and rejects duplicates`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_2');
         const vcsFolderName = '.vcsgib_test_bc_2';
         try {
@@ -112,7 +113,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `switches active branch with checkout and projects branch snapshot onto worktree subfolder`, async () => {
+    await ifWe(lc, `switches active branch with checkout and projects branch snapshot onto worktree subfolder`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_3');
         const vcsFolderName = '.vcsgib_test_bc_3';
         try {
@@ -238,7 +239,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `rejects checkout when branch does not exist or branchName missing`, async () => {
+    await ifWe(lc, `rejects checkout when branch does not exist or branchName missing`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_4');
         const vcsFolderName = '.vcsgib_test_bc_4';
         try {
@@ -280,7 +281,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `lists branches silently on secondary branch without error noise`, async () => {
+    await ifWe(lc, `lists branches silently on secondary branch without error noise`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_secondary');
         const vcsFolderName = '.vcsgib_test_bc_sec';
         try {
@@ -322,7 +323,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `branches single file-root item and projects into file-branch worktree on checkout`, async () => {
+    await ifWe(lc, `branches single file-root item and projects into file-branch worktree on checkout`, async () => {
         const testDir = path.join(process.cwd(), '.test_branch_checkout_file_root');
         const vcsFolderName = '.vcsgib_test_bc_file';
         try {
@@ -401,7 +402,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
         }
     });
 
-    await ifWeMight(lc, `performs vcs merge end-to-end between main and secondary branch`, async () => {
+    await ifWe(lc, `performs vcs merge end-to-end between main and secondary branch`, async () => {
         const testDir = path.join(process.cwd(), '.test_vcs_merge_e2e');
         const vcsFolderName = '.vcsgib_test_merge_e2e';
         try {
@@ -482,14 +483,14 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
 
             // 5. Execute vcs merge feature-merge into main
             const mergeRes = await executeMergeCmd({
-                targetBranchName: 'feature-merge',
+                incomingBranchName: 'feature-merge',
                 targetDir: testDir,
                 vcsFolderName,
                 quiet: true,
             });
 
-            iReckon(lc, mergeRes.activeBranch).willEqual('main');
-            iReckon(lc, mergeRes.targetBranch).willEqual('feature-merge');
+            iReckon(lc, mergeRes.baseBranch).willEqual('main');
+            iReckon(lc, mergeRes.incomingBranch).willEqual('feature-merge');
 
             // 6. Verify projected file on physical worktree disk contains merged lines
             const mergedAppTs = await fs.readFile(path.join(testDir, 'app.ts'), 'utf8');