@ibgib/vcs-gib 0.0.21 → 0.0.26

package/dist/cli/commands/log-cmd.mjs

@@ -3,19 +3,21 @@
  *
  * Command handler for `vcs log`.
  * Reads active branch timeline from B2tFSIndexIbGib_V1 in localSpace,
- * walks branch timeline history backward, and displays formatted commit history.
+ * walks branch or item timeline history backward, and displays formatted commit and comment history.
  */
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
 import { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
-import { getB2tFSIndexIbGib, extractBranchNameFromAddr } from '../../engine/index/index-helper.mjs';
+import { B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
+import { getB2tFSIndexIbGib } from '../../engine/index/index-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 const lcFile = `[log-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
-export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, } = {}) {
+export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', filePath, allComments = false, quiet = false, } = {}) {
     const lc = `${lcFile}[${executeLogCmd.name}]`;
     try {
         if (logalot) {
@@ -46,40 +48,110 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
             branchName,
         });
         // 2. Fetch active branch node address matching active branchName
-        const branchAddrs = [
-            ...(indexIbGib.rel8ns?.branch || []),
-            ...(indexIbGib.rel8ns?.branch_tjp || []),
-        ];
+        const branchAddrs = indexIbGib.rel8ns?.branch || indexIbGib.rel8ns?.branch_tjp || [];
         let currBranchAddr;
-        // Match branchName against branchAddrs by space-qualified address or raw atom ib string
-        for (const addr of branchAddrs) {
-            const parsedName = extractBranchNameFromAddr(addr);
-            if (parsedName === branchName) {
-                currBranchAddr = addr;
-                break;
-            }
-        }
-        // Fallback: fetch branch nodes via getIbGibWithMetaspaceFallback to match b.data?.name === branchName
-        if (!currBranchAddr) {
-            for (const addr of branchAddrs) {
+        if (branchAddrs.length > 0) {
+            let branchIbGibs = [];
+            for (const bAddr of branchAddrs) {
                 const bIbGib = await getIbGibWithMetaspaceFallback({
-                    addr,
+                    addr: bAddr,
                     space: activeSpace,
                     metaspace,
                 });
-                if (bIbGib?.data?.name === branchName) {
-                    currBranchAddr = addr;
-                    break;
+                if (bIbGib) {
+                    branchIbGibs.push(bIbGib);
                 }
             }
+            const matchingBranches = branchIbGibs.filter(b => b?.data?.name === branchName);
+            const activeBranchIbGib = matchingBranches.sort((a, b) => (b.data?.n || 0) - (a.data?.n || 0))[0]
+                || branchIbGibs.at(-1);
+            if (activeBranchIbGib) {
+                currBranchAddr = getIbGibAddr({ ibGib: activeBranchIbGib });
+            }
         }
-        // Ultimate fallback if no match found
-        if (!currBranchAddr) {
-            currBranchAddr = branchAddrs.at(0);
+        const commits = [];
+        // #region File-Specific Log Mode (vcs log <filePath>)
+        if (filePath) {
+            const normalizedRelPath = path.relative(repoRoot, path.resolve(absTargetDir, filePath)).replace(/\\/g, '/');
+            // Find current root item
+            const branchIbGib = currBranchAddr
+                ? await getIbGibWithMetaspaceFallback({ addr: currBranchAddr, space: activeSpace, metaspace })
+                : undefined;
+            const rootItemAddr = branchIbGib?.rel8ns?.b2tFS_item?.at(-1) || branchIbGib?.rel8ns?.b2tfs_item?.at(-1);
+            if (!rootItemAddr) {
+                throw new Error(`No root item found on branch ${branchName} (E: 4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b)`);
+            }
+            const targetItem = await logCmd_findItemByPath({
+                rootItemAddr,
+                targetRelPath: normalizedRelPath,
+                space: activeSpace,
+                metaspace,
+            });
+            if (!targetItem) {
+                throw new Error(`Path '${normalizedRelPath}' not found in active branch snapshot (E: 5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c)`);
+            }
+            // Walk target item timeline history backward
+            const visitedItemAddrs = new Set();
+            let currItem = targetItem;
+            while (currItem) {
+                const itemAddr = getIbGibAddr({ ibGib: currItem });
+                if (visitedItemAddrs.has(itemAddr)) {
+                    break;
+                }
+                visitedItemAddrs.add(itemAddr);
+                const commentAddrs = currItem.rel8ns?.comment || [];
+                for (const cAddr of commentAddrs) {
+                    const commentIbGib = await getIbGibWithMetaspaceFallback({
+                        addr: cAddr,
+                        space: activeSpace,
+                        metaspace,
+                    });
+                    if (commentIbGib) {
+                        commits.push({
+                            commitAddr: itemAddr,
+                            commentAddr: cAddr,
+                            message: commentIbGib.data?.text || '',
+                            timestamp: commentIbGib.data?.textTimestamp || commentIbGib.data?.timestamp || '',
+                            author: 'vcs-user',
+                        });
+                    }
+                }
+                const pastAddr = currItem.rel8ns?.past?.at(0) || currItem.rel8ns?.ancestor?.at(0);
+                if (pastAddr) {
+                    currItem = await getIbGibWithMetaspaceFallback({
+                        addr: pastAddr,
+                        space: activeSpace,
+                        metaspace,
+                    });
+                }
+                else {
+                    currItem = undefined;
+                }
+            }
+            if (!quiet) {
+                console.log(`File: ${normalizedRelPath} (branch: ${branchName}) (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
+                if (commits.length === 0) {
+                    console.log('No comments found for this file.');
+                }
+                else {
+                    for (const commit of commits) {
+                        console.log(`\nitem ${commit.commitAddr}`);
+                        if (commit.timestamp) {
+                            console.log(`Date:   ${commit.timestamp}`);
+                        }
+                        console.log(`\n    ${commit.message}\n`);
+                    }
+                }
+            }
+            return {
+                branchName,
+                targetPath: normalizedRelPath,
+                commits,
+            };
         }
+        // #endregion File-Specific Log Mode
+        // #region Standard Branch Log Mode
         const visitedAddrs = new Set();
-        const commits = [];
-        // 3. Walk timeline history backward
         while (currBranchAddr && !visitedAddrs.has(currBranchAddr)) {
             visitedAddrs.add(currBranchAddr);
             const branchIbGib = await getIbGibWithMetaspaceFallback({
@@ -90,25 +162,60 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
             if (!branchIbGib) {
                 break;
             }
-            const commentAddr = branchIbGib.rel8ns?.comment?.at(0);
-            const rootItemAddr = branchIbGib.rel8ns?.b2tfs_item?.at(0);
-            if (commentAddr) {
+            const rootItemAddr = branchIbGib.rel8ns?.b2tFS_item?.at(-1) || branchIbGib.rel8ns?.b2tfs_item?.at(-1);
+            let rootItem;
+            if (rootItemAddr) {
+                rootItem = await getIbGibWithMetaspaceFallback({
+                    addr: rootItemAddr,
+                    space: activeSpace,
+                    metaspace,
+                });
+            }
+            let commentAddrs = [
+                ...(branchIbGib.rel8ns?.comment || []),
+                ...(rootItem?.rel8ns?.comment || []),
+            ];
+            // Deduplicate
+            commentAddrs = Array.from(new Set(commentAddrs));
+            let message = '';
+            let timestamp = branchIbGib.data?.committedAt || '';
+            // If branch has a direct comment, use that first, otherwise use the last added comment on root item
+            let primaryCommentAddr = branchIbGib.rel8ns?.comment?.at(-1) || rootItem?.rel8ns?.comment?.at(-1) || commentAddrs.at(0);
+            if (primaryCommentAddr) {
                 const commentIbGib = await getIbGibWithMetaspaceFallback({
-                    addr: commentAddr,
+                    addr: primaryCommentAddr,
                     space: activeSpace,
                     metaspace,
                 });
-                const message = commentIbGib?.data?.text || '';
-                const timestamp = commentIbGib?.data?.textTimestamp || commentIbGib?.data?.timestamp || branchIbGib.data?.committedAt || '';
-                const author = 'vcs-user';
+                if (commentIbGib?.data?.text) {
+                    message = commentIbGib.data.text;
+                }
+                if (commentIbGib?.data?.textTimestamp || commentIbGib?.data?.timestamp) {
+                    timestamp = commentIbGib.data.textTimestamp || commentIbGib.data.timestamp || timestamp;
+                }
+            }
+            const committedPaths = branchIbGib.data?.committedPaths || [];
+            const itemComments = [];
+            if (allComments && rootItem) {
+                await logCmd_collectAllItemComments({
+                    item: rootItem,
+                    space: activeSpace,
+                    metaspace,
+                    currentRelPath: '',
+                    outComments: itemComments,
+                });
+            }
+            if (message || primaryCommentAddr || (committedPaths && committedPaths.length > 0)) {
                 commits.push({
                     branchAddr: currBranchAddr,
-                    commitAddr: commentAddr,
-                    commentAddr,
-                    message,
+                    commitAddr: currBranchAddr,
+                    commentAddr: primaryCommentAddr,
+                    message: message || '(no commit message)',
                     timestamp,
-                    author,
+                    author: 'vcs-user',
                     rootItemAddr,
+                    committedPaths,
+                    itemComments: itemComments.length > 0 ? itemComments : undefined,
                 });
             }
             // Move to previous branch node in timeline
@@ -125,6 +232,16 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
                     console.log(`Author: ${commit.author}`);
                     console.log(`Date:   ${commit.timestamp}`);
                     console.log(`\n    ${commit.message}\n`);
+                    if (commit.committedPaths && commit.committedPaths.length > 0) {
+                        console.log(`Changed: ${commit.committedPaths.join(', ')}`);
+                    }
+                    if (commit.itemComments && commit.itemComments.length > 0) {
+                        console.log('Item Comments:');
+                        for (const ic of commit.itemComments) {
+                            const label = ic.name ? `${ic.path} (${ic.name})` : ic.path;
+                            console.log(`  * [${label}]: ${ic.message}`);
+                        }
+                    }
                 }
             }
         }
@@ -132,6 +249,7 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
             branchName,
             commits,
         };
+        // #endregion Standard Branch Log Mode
     }
     catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)} (E: 5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c)`);
@@ -143,4 +261,84 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
         }
     }
 }
+async function logCmd_findItemByPath({ rootItemAddr, targetRelPath, space, metaspace, }) {
+    const rootItem = await getIbGibWithMetaspaceFallback({
+        addr: rootItemAddr,
+        space,
+        metaspace,
+    });
+    if (!rootItem) {
+        return undefined;
+    }
+    if (!targetRelPath || targetRelPath === '.' || targetRelPath === '') {
+        return rootItem;
+    }
+    const segments = targetRelPath.split('/');
+    let currentItem = rootItem;
+    for (const segment of segments) {
+        if (currentItem.data?.fsType !== 'folder') {
+            return undefined;
+        }
+        const childAddrs = currentItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
+        let nextItem;
+        for (const cAddr of childAddrs) {
+            const child = await getIbGibWithMetaspaceFallback({
+                addr: cAddr,
+                space,
+                metaspace,
+            });
+            if (child && child.data?.name === segment) {
+                nextItem = child;
+                break;
+            }
+        }
+        if (!nextItem) {
+            return undefined;
+        }
+        currentItem = nextItem;
+    }
+    return currentItem;
+}
+async function logCmd_collectAllItemComments({ item, space, metaspace, currentRelPath, outComments, }) {
+    if (!item || !item.data) {
+        return;
+    }
+    const itemComments = item.rel8ns?.comment || [];
+    for (const cAddr of itemComments) {
+        const commentIbGib = await getIbGibWithMetaspaceFallback({
+            addr: cAddr,
+            space,
+            metaspace,
+        });
+        if (commentIbGib && commentIbGib.data?.text) {
+            outComments.push({
+                path: currentRelPath || '(root)',
+                name: commentIbGib.data?.name,
+                message: commentIbGib.data.text,
+            });
+        }
+    }
+    if (item.data.fsType === 'folder') {
+        const childAddrs = item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
+        for (const childAddr of childAddrs) {
+            const childItem = await getIbGibWithMetaspaceFallback({
+                addr: childAddr,
+                space,
+                metaspace,
+            });
+            if (childItem && childItem.data) {
+                const childRel = currentRelPath
+                    ? `${currentRelPath}/${childItem.data.name}`
+                    : childItem.data.name;
+                await logCmd_collectAllItemComments({
+                    item: childItem,
+                    space,
+                    metaspace,
+                    currentRelPath: childRel,
+                    outComments,
+                });
+            }
+        }
+    }
+}
 //# sourceMappingURL=log-cmd.mjs.map

package/dist/cli/commands/log-cmd.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAKlF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,WAAW,CAAC;AAC3B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAuBjC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAChC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAe,EAAE;IACd,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC;IAE9C,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,+DAA+D,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,qBAAqB,CAAC;YAC7E,QAAQ,EAAE,YAAY;YACtB,aAAa;SAChB,CAAC,CAAC;QAEH,qBAAqB;QACrB,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,wDAAwD,CAAC,CAAC;QAC3H,CAAC;QAED,qEAAqE;QACrE,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;QACzH,CAAC;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,IAAI,MAAM,CAAC;QAE3D,gDAAgD;QAChD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAsB,CAAC;YACxD,SAAS;YACT,OAAO;YACP,UAAU;SACb,CAAC,CAAC;QAEH,iEAAiE;QACjE,MAAM,WAAW,GAAG;YAChB,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC;YACpC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;SAC3C,CAAC;QAEF,IAAI,cAAkC,CAAC;QAEvC,wFAAwF;QACxF,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC7B,MAAM,UAAU,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;YACnD,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;gBAC5B,cAAc,GAAG,IAAI,CAAC;gBACtB,MAAM;YACV,CAAC;QACL,CAAC;QAED,sGAAsG;QACtG,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAC7B,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;oBAC/C,IAAI;oBACJ,KAAK,EAAE,WAAW;oBAClB,SAAS;iBACZ,CAAwB,CAAC;gBAC1B,IAAI,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;oBACpC,cAAc,GAAG,IAAI,CAAC;oBACtB,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC;QAED,sCAAsC;QACtC,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,cAAc,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,MAAM,OAAO,GAAiB,EAAE,CAAC;QAEjC,oCAAoC;QACpC,OAAO,cAAc,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YACzD,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YAEjC,MAAM,WAAW,GAAG,MAAM,6BAA6B,CAAC;gBACpD,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,WAAW;gBAClB,SAAS;aACZ,CAAwB,CAAC;YAE1B,IAAI,CAAC,WAAW,EAAE,CAAC;gBACf,MAAM;YACV,CAAC;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YAE3D,IAAI,WAAW,EAAE,CAAC;gBACd,MAAM,YAAY,GAAG,MAAM,6BAA6B,CAAC;oBACrD,IAAI,EAAE,WAAW;oBACjB,KAAK,EAAE,WAAW;oBAClB,SAAS;iBACZ,CAAoB,CAAC;gBAEtB,MAAM,OAAO,GAAG,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;gBAC/C,MAAM,SAAS,GAAG,YAAY,EAAE,IAAI,EAAE,aAAa,IAAI,YAAY,EAAE,IAAI,EAAE,SAAS,IAAI,WAAW,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC;gBAC5H,MAAM,MAAM,GAAG,UAAU,CAAC;gBAE1B,OAAO,CAAC,IAAI,CAAC;oBACT,UAAU,EAAE,cAAc;oBAC1B,UAAU,EAAE,WAAW;oBACvB,WAAW;oBACX,OAAO;oBACP,SAAS;oBACT,MAAM;oBACN,YAAY;iBACf,CAAC,CAAC;YACP,CAAC;YAED,2CAA2C;YAC3C,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5F,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,wCAAwC,CAAC,CAAC;YAC3E,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACnC,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC3B,OAAO,CAAC,GAAG,CAAC,YAAY,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;oBACxC,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;oBAC3C,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,UAAU;YACV,OAAO;SACV,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}
+{"version":3,"file":"log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/log-cmd.mts"],"names":[],"mappings":"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"}

package/dist/cli/commands/merge-cmd.d.mts

@@ -2,22 +2,35 @@
  * @module merge-cmd
  *
  * Command handler for `vcs merge <branchName>`.
- * Merges target branch into active branch using SyncSagaCoordinator sync and 3-way graft merge strategy.
- * Projects merged branch snapshot onto active branch physical worktree path.
+ * Merges the incoming branch into the base (active/current) branch using
+ * SyncSagaCoordinator sync and 3-way graft merge strategy.
+ * Projects merged branch snapshot onto the base branch physical worktree path.
+ *
+ * ## Terminology (matches standard git usage)
+ *
+ * * **base** branch / space — the branch currently checked out, the one being
+ *   merged INTO (analogous to `ours` / `HEAD` in git)
+ * * **incoming** branch / space — the branch whose changes are being merged IN
+ *   (analogous to `theirs` / the topic branch in git)
  */
 export interface MergeCmdOpts {
-    targetBranchName?: string;
+    /** The incoming branch name — the branch whose changes will be merged in. */
+    incomingBranchName?: string;
     targetDir?: string;
     vcsFolderName?: string;
     quiet?: boolean;
+    /** When true, emit diagnostic checkpoint logging (useful in tests). */
+    diagLog?: boolean;
 }
 export interface MergeCmdResult {
-    activeBranch: string;
-    targetBranch: string;
-    activeSpaceId: string;
-    targetSpaceId: string;
+    /** The base (current/active) branch name — merged into. */
+    baseBranch: string;
+    /** The incoming branch name — merged from. */
+    incomingBranch: string;
+    baseSpaceId: string;
+    incomingSpaceId: string;
     mergedBranchAddr?: string;
     worktreePath: string;
 }
-export declare function executeMergeCmd({ targetBranchName, targetDir, vcsFolderName, quiet, }?: MergeCmdOpts): Promise<MergeCmdResult>;
+export declare function executeMergeCmd({ incomingBranchName, targetDir, vcsFolderName, quiet, diagLog, }?: MergeCmdOpts): Promise<MergeCmdResult>;
 //# sourceMappingURL=merge-cmd.d.mts.map

package/dist/cli/commands/merge-cmd.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AA0BH,MAAM,WAAW,YAAY;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,eAAe,CAAC,EAClC,gBAAgB,EAChB,SAAyB,EACzB,aAAyB,EACzB,KAAa,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAuO7C"}
+{"version":3,"file":"merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA6BH,MAAM,WAAW,YAAY;IACzB,6EAA6E;IAC7E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uEAAuE;IACvE,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC3B,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,eAAe,CAAC,EAClC,kBAAkB,EAClB,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,OAAe,GAClB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoS7C"}