@ibgib/vcs-gib 0.0.30 → 0.0.32

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

@@ -1,37 +1,21 @@
 /**
  * @module commit-cmd
  * 
- * Command handler for `vcs commit -m "message"`.
- * Ingests staged items and co-located .ib.*.md comment metadata files,
- * attaches comments to corresponding file and folder b2tfs_items,
- * attaches overall commit message to root b2tfs_item, evolves root item,
- * advances B2tFSBranchIbGib_V1 with committedPaths, and clears index staging area.
+ * CLI command handler for `vcs commit -m <message>`.
+ * Bootstraps workspace projection space and delegates to executeVcsCommit.
  */
 
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import { Dirent } from 'node:fs';
-import crypto from 'node:crypto';
 
-import { getUUID, extractErrorMsg, delay } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.mjs';
-import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
-import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { putInSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { createCommentIbGib } from '@ibgib/core-gib/dist/common/comment/comment-helper.mjs';
-import { CommentIbGib_V1 } from '@ibgib/core-gib/dist/common/comment/comment-types.mjs';
+import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { executeVcsCommit } from '@ibgib/core-gib/dist/vcs/commands/commit-cmd.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-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';
-import { getB2tFSBranchSpaceName, resolveContextualBranchName } from '../../engine/branch/branch-helper.mjs';
-import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
-import { getB2tFSIndexIbGib, updateB2tFSIndexIbGib, getSpaceQualifiedIbGibAddr } from '../../engine/index/index-helper.mjs';
-import { B2tFSStagedItemRecord } from '../../engine/index/index-types.mjs';
-import { isCommentMetadataFilename, extractCommentTopicName } from '../../engine/status/status-helper.mjs';
-import { TransformResult } from '@ibgib/ts-gib/dist/types.mjs';
-import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { getOrCreateWorkspaceProjectionSpace } from '@ibgib/node-gib/dist/vcs/workspace-space-helper.mjs';
+import { readVcsIndexProjectionFromDisk, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 
 const lcFile = `[commit-cmd]`;
@@ -41,29 +25,29 @@ export interface CommitCmdOpts {
     message?: string;
     targetDir?: string;
     vcsFolderName?: string;
+    author?: string;
     quiet?: boolean;
 }
 
 export interface CommitCmdResult {
+    branchName: string;
     commitAddr: string;
     commentAddr?: string;
-    branchName: string;
-    committedPaths: string[];
     rootItemAddr: string;
+    committedPaths: string[];
+    ingestedCommentsCount: number;
 }
 
 export async function executeCommitCmd({
-    message = '',
+    message,
     targetDir = process.cwd(),
     vcsFolderName = '.vcsgib',
+    author = 'vcs-user',
     quiet = false,
 }: CommitCmdOpts = {}): Promise<CommitCmdResult> {
     const lc = `${lcFile}[${executeCommitCmd.name}]`;
-
     try {
-        if (logalot) {
-            console.log(`${lc} starting executeCommitCmd (I: 9a8b7c6d5e4f3a2b1c0d9e8f7a6b5c4d)`);
-        }
+        if (logalot) { console.log(`${lc} starting... (I: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`); }
 
         const absTargetDir = path.resolve(targetDir);
 
@@ -76,13 +60,13 @@ export async function executeCommitCmd({
         try {
             await fs.access(vcsPath);
         } catch {
-            throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
+            throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d)`);
         }
 
-        // Fetch authoritative repository index from localSpace
-        const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+        // Fetch authoritative B2tFSIndexIbGib_V1 from space
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
         if (!indexIbGib) {
-            throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f)`);
+            throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d)`);
         }
 
         const branchName = resolveContextualBranchName({
@@ -92,466 +76,55 @@ export async function executeCommitCmd({
         });
         const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
 
-        // Target active branch space b2s_<activeBranch>
+        // Resolve active branch space b2s_<branchName>
         const { space: activeSpace } = await getOrCreateBranchSpace({
             metaspace,
             vcsPath,
             branchName,
         });
 
-        // Verify there are staged items
-        const stagedPathsMap: { [relPath: string]: B2tFSStagedItemRecord } = { ...(indexIbGib.data?.stagedPaths || {}) };
-        const committedPaths = Object.keys(stagedPathsMap);
-        if (committedPaths.length === 0) {
-            throw new Error(`Nothing to commit (no staged items found in index) (E: 4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a)`);
-        }
-
-        // Find active branch node
-        let currentBranchIbGib: B2tFSBranchIbGib_V1 | undefined;
-        let currentBranchAddr: string | undefined;
-
-        const branchAddrs = [
-            ...(indexIbGib.rel8ns?.branch || []),
-            ...(indexIbGib.rel8ns?.branch_tjp || []),
-        ];
-
-        if (branchAddrs.length > 0) {
-            let branchIbGibs: B2tFSBranchIbGib_V1[] = [];
-            for (const bAddr of branchAddrs) {
-                const bIbGib = await getIbGibWithMetaspaceFallback({
-                    addr: bAddr,
-                    space: activeSpace,
-                    metaspace,
-                });
-                if (bIbGib) {
-                    branchIbGibs.push(bIbGib as B2tFSBranchIbGib_V1);
-                }
-            }
-
-            currentBranchIbGib = branchIbGibs.findLast(
-                (b) => (b as B2tFSBranchIbGib_V1)?.data?.name === branchName,
-            ) as B2tFSBranchIbGib_V1 || (branchIbGibs.at(-1) as B2tFSBranchIbGib_V1);
-
-            if (currentBranchIbGib) {
-                currentBranchAddr = getIbGibAddr({ ibGib: currentBranchIbGib });
-            }
-        }
-
-        const currentRootAddr = currentBranchIbGib?.rel8ns?.b2tFS_item?.at(-1) || currentBranchIbGib?.rel8ns?.b2tfs_item?.at(-1);
-
-        // 1. Evolve root item graph with staged items and ingest co-located .ib.*.md comment files
-        const repoName = path.basename(repoRoot) || 'root';
-        let { newRootItem, newRootAddr, ingestedCommentCount } = await commitCmd_buildEvolvedRootItem({
-            currentRootAddr,
-            stagedPathsMap,
-            space: activeSpace,
+        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
             metaspace,
-            repoName,
-            worktreeDir: activeWorktreeDir,
-        });
-
-        if ((!message || message.trim().length === 0) && ingestedCommentCount === 0) {
-            throw new Error(`Commit message is required (-m "message" or companion comment files) (E: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`);
-        }
-
-        // 2. If CLI message is provided, attach CommentIbGib to the root b2tfs item
-        let commentAddr: string | undefined;
-        if (message && message.trim().length > 0) {
-            const commentRes = await createCommentIbGib({
-                text: message.trim(),
-                saveInSpace: true,
-                space: activeSpace,
-            });
-            const commentIbGib = commentRes.newIbGib as CommentIbGib_V1;
-            commentAddr = getIbGibAddr({ ibGib: commentIbGib });
-            await metaspace.registerNewIbGib({ ibGib: commentIbGib, space: activeSpace });
-
-            const existingComments = newRootItem.rel8ns?.comment || [];
-            const evolveRootRes = await evolveB2tFSItemIbGib({
-                existingItem: newRootItem,
-                rel8nsToUpdate: {
-                    comment: [...existingComments, commentAddr],
-                },
-            });
-            await persistTransformResult({ resTransform: evolveRootRes, space: activeSpace });
-            await metaspace.registerNewIbGib({ ibGib: evolveRootRes.newIbGib, space: activeSpace });
-
-            newRootItem = evolveRootRes.newIbGib as B2tFSItemIbGib_V1;
-            newRootAddr = getIbGibAddr({ ibGib: newRootItem });
-        }
-
-        // 3. Advance B2tFSBranchIbGib_V1 node inside activeSpace
-        const branchUuid = currentBranchIbGib?.data?.uuid || (await getUUID());
-        const newBranchRes = await Factory_V1.firstGen({
-            parentIbGib: currentBranchIbGib || ROOT,
-            ib: `b2tfs_branch ${branchName} v1 ${branchUuid}`,
-            data: {
-                ...(currentBranchIbGib?.data || {}),
-                name: branchName,
-                uuid: branchUuid,
-                classname: 'B2tFSBranchIbGib_V1',
-                committedAt: new Date().toISOString(),
-                committedPaths,
-            },
-            rel8ns: {
-                b2tfs_item: [newRootAddr],
-                ...(commentAddr ? { comment: [commentAddr] } : {}),
-            },
-        });
-
-        const newBranchIbGib = newBranchRes.newIbGib as B2tFSBranchIbGib_V1;
-        const newBranchAddr = getIbGibAddr({ ibGib: newBranchIbGib });
-        await persistTransformResult({ resTransform: newBranchRes, space: activeSpace });
-        await metaspace.registerNewIbGib({ ibGib: newBranchIbGib, space: activeSpace });
-
-        const sqBranchAddr = getSpaceQualifiedIbGibAddr({
-            spaceId: activeSpace.data?.spaceSubPath || activeSpace.data?.name || getB2tFSBranchSpaceName(branchName),
-            ibGibAddr: newBranchAddr,
+            workspaceRoot: activeWorktreeDir,
+            vcsFolderName,
+            backingSpace: activeSpace,
         });
 
-        // 4. Update B2tFSIndexIbGib_V1 in activeSpace & localSpace
-        const updatedIndex = await updateB2tFSIndexIbGib({
-            space: activeSpace,
+        const commitRes = await executeVcsCommit({
             metaspace,
+            localSpace,
+            activeBranchSpace: activeSpace,
+            workspaceSpace,
             indexIbGib,
-            dataToUpdate: {
-                stagedPaths: {},
-                staged_item: [],
-            },
-            rel8nsToUpdate: {
-                branch: [sqBranchAddr],
-                branch_tjp: [sqBranchAddr],
-            },
-            vcsPath,
+            message,
+            author,
+            repoRoot,
+            targetDir: absTargetDir,
+            vcsFolderName,
         });
 
-        if (localSpace !== activeSpace) {
-            await putInSpace({ space: localSpace, ibGib: updatedIndex });
-        }
+        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: commitRes.updatedIndex });
 
         if (!quiet) {
-            const shortGib = newBranchIbGib.gib ? newBranchIbGib.gib.slice(0, 7) : 'commit';
-            const logMsg = message ? message.trim() : '(committed)';
-            console.log(`[${branchName} ${shortGib}] ${logMsg} (I: 5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b)`);
-            console.log(` ${committedPaths.length} file(s) changed`);
+            console.log(`[${branchName} ${commitRes.commitAddr.slice(0, 7)}] ${message || '(companion comments committed)'}`);
+            console.log(` ${commitRes.committedPaths.length} file(s) changed`);
+            if (commitRes.ingestedCommentsCount > 0) {
+                console.log(` ${commitRes.ingestedCommentsCount} companion comment(s) attached and merged`);
+            }
         }
 
         return {
-            commitAddr: newBranchAddr,
-            commentAddr,
-            branchName,
-            committedPaths,
-            rootItemAddr: newRootAddr,
+            branchName: commitRes.branchName,
+            commitAddr: commitRes.commitAddr,
+            commentAddr: commitRes.commentAddr,
+            rootItemAddr: commitRes.rootItemAddr,
+            committedPaths: commitRes.committedPaths,
+            ingestedCommentsCount: commitRes.ingestedCommentsCount,
         };
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)} (E: 6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c)`);
         throw error;
     } finally {
-        await delay(50);
-        if (logalot) {
-            console.log(`${lc} complete. (I: 7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d)`);
-        }
-    }
-}
-
-// #region commitCmd_buildEvolvedRootItem
-async function commitCmd_buildEvolvedRootItem({
-    currentRootAddr,
-    stagedPathsMap,
-    space,
-    metaspace,
-    repoName,
-    worktreeDir,
-}: {
-    currentRootAddr?: string;
-    stagedPathsMap: { [relPath: string]: B2tFSStagedItemRecord };
-    space: any;
-    metaspace: any;
-    repoName: string;
-    worktreeDir: string;
-}): Promise<{ newRootItem: B2tFSItemIbGib_V1; newRootAddr: string; ingestedCommentCount: number }> {
-    let ingestedCommentCount = 0;
-    const itemsByRelPath = new Map<string, { itemAddr: string; fsType: 'file' | 'folder'; item?: B2tFSItemIbGib_V1 }>();
-
-    if (currentRootAddr) {
-        const currentRootItem = await getIbGibWithMetaspaceFallback({
-            addr: currentRootAddr,
-            space,
-            metaspace,
-        }) as B2tFSItemIbGib_V1;
-
-        if (currentRootItem) {
-            await commitCmd_walkBranchGraph({
-                item: currentRootItem,
-                space,
-                metaspace,
-                currentRelPath: '',
-                outMap: itemsByRelPath,
-            });
-        }
-    }
-
-    // Overlay staged items
-    for (const [relPath, stagedRec] of Object.entries(stagedPathsMap)) {
-        itemsByRelPath.set(relPath, {
-            itemAddr: stagedRec.itemAddr,
-            fsType: stagedRec.fsType || 'file',
-        });
-    }
-
-    // 1. Ingest co-located .ib.<filename>.md comment files for staged files
-    for (const [relPath, itemRec] of itemsByRelPath.entries()) {
-        if (itemRec.fsType !== 'file') { continue; }
-
-        const dir = path.dirname(relPath);
-        const base = path.basename(relPath);
-        const commentDir = dir === '.' ? worktreeDir : path.join(worktreeDir, dir);
-        const commentFullPath = path.join(commentDir, `.ib.${base}.md`);
-
-        let commentText = '';
-        try {
-            commentText = await fs.readFile(commentFullPath, 'utf8');
-        } catch {
-            // No comment file for this file
-            continue;
-        }
-
-        if (commentText.trim().length > 0) {
-            const commentRes = await createCommentIbGib({
-                text: commentText.trim(),
-                saveInSpace: true,
-                space,
-            });
-            const commentIbGib = commentRes.newIbGib as CommentIbGib_V1;
-            const commentAddr = getIbGibAddr({ ibGib: commentIbGib });
-            await metaspace.registerNewIbGib({ ibGib: commentIbGib, space });
-            ingestedCommentCount++;
-
-            const currentItem = itemRec.item || (await getIbGibWithMetaspaceFallback({
-                addr: itemRec.itemAddr,
-                space,
-                metaspace,
-            }) as B2tFSItemIbGib_V1);
-
-            if (currentItem) {
-                const existingComments = currentItem.rel8ns?.comment || [];
-                const evolvedItemRes = await evolveB2tFSItemIbGib({
-                    existingItem: currentItem,
-                    rel8nsToUpdate: {
-                        comment: [...existingComments, commentAddr],
-                    },
-                });
-                await persistTransformResult({ resTransform: evolvedItemRes, space });
-                await metaspace.registerNewIbGib({ ibGib: evolvedItemRes.newIbGib, space });
-
-                itemRec.itemAddr = getIbGibAddr({ ibGib: evolvedItemRes.newIbGib });
-                itemRec.item = evolvedItemRes.newIbGib as B2tFSItemIbGib_V1;
-            }
-
-            try {
-                await fs.unlink(commentFullPath);
-            } catch {
-                // Delete failed / ignore
-            }
-        }
-    }
-
-    // Ensure parent folder entries exist for all items
-    const allRelPaths = Array.from(itemsByRelPath.keys());
-    for (const relPath of allRelPaths) {
-        const parts = relPath.split('/');
-        parts.pop(); // Remove file/folder name to get parent path
-        let currentFolderRel = '';
-        for (const part of parts) {
-            currentFolderRel = currentFolderRel ? `${currentFolderRel}/${part}` : part;
-            if (!itemsByRelPath.has(currentFolderRel)) {
-                itemsByRelPath.set(currentFolderRel, { itemAddr: '', fsType: 'folder' });
-            }
-        }
-    }
-
-    // Collect all folder paths (including root '')
-    const folderPathsSet = new Set<string>();
-    folderPathsSet.add('');
-    for (const [relPath, itemRec] of itemsByRelPath.entries()) {
-        if (itemRec.fsType === 'folder' || relPath === '') {
-            folderPathsSet.add(relPath);
-        }
-    }
-
-    // Sort folders deepest path first so children folders are built before parents
-    const sortedFolders = Array.from(folderPathsSet).sort((a, b) => {
-        const depthA = a ? a.split('/').length : 0;
-        const depthB = b ? b.split('/').length : 0;
-        return depthB - depthA;
-    });
-
-    const createdFolderAddrs = new Map<string, string>();
-    let rootFolderItem: B2tFSItemIbGib_V1 | undefined;
-    let rootFolderAddr: string = '';
-
-    for (const folderRelPath of sortedFolders) {
-        const childAddrs: string[] = [];
-        for (const [itemRelPath, itemRec] of itemsByRelPath.entries()) {
-            if (!itemRelPath || itemRelPath === folderRelPath) {
-                continue;
-            }
-            const parentRelPath = commitCmd_getParentRelPath(itemRelPath);
-            if (parentRelPath === folderRelPath) {
-                if (itemRec.fsType === 'folder') {
-                    const folderAddr = createdFolderAddrs.get(itemRelPath);
-                    if (folderAddr && !childAddrs.includes(folderAddr)) {
-                        childAddrs.push(folderAddr);
-                    }
-                } else {
-                    if (itemRec.itemAddr && !childAddrs.includes(itemRec.itemAddr)) {
-                        childAddrs.push(itemRec.itemAddr);
-                    }
-                }
-            }
-        }
-
-        // Check for folder-level .ib.<topic>.md files in this folder
-        const folderDiskPath = folderRelPath ? path.join(worktreeDir, folderRelPath) : worktreeDir;
-        const folderCommentAddrs: string[] = [];
-
-        try {
-            const dirents = await fs.readdir(folderDiskPath, { withFileTypes: true });
-            for (const dirent of dirents) {
-                if (dirent.isFile() && isCommentMetadataFilename(dirent.name)) {
-                    const topicName = extractCommentTopicName(dirent.name);
-                    const isCoLocatedFileComment = itemsByRelPath.has(folderRelPath ? `${folderRelPath}/${topicName}` : topicName);
-
-                    if (!isCoLocatedFileComment) {
-                        const fullCommentPath = path.join(folderDiskPath, dirent.name);
-                        const commentContent = await fs.readFile(fullCommentPath, 'utf8');
-
-                        if (commentContent.trim().length > 0) {
-                            const commentRes = await createCommentIbGib({
-                                text: commentContent.trim(),
-                                saveInSpace: true,
-                                space,
-                            });
-                            const commentIbGib = commentRes.newIbGib as CommentIbGib_V1;
-                            const cAddr = getIbGibAddr({ ibGib: commentIbGib });
-                            await metaspace.registerNewIbGib({ ibGib: commentIbGib, space });
-                            folderCommentAddrs.push(cAddr);
-                            ingestedCommentCount++;
-                        }
-
-                        try {
-                            await fs.unlink(fullCommentPath);
-                        } catch {
-                            // ignore delete error
-                        }
-                    }
-                }
-            }
-        } catch {
-            // Folder may not exist on disk
-        }
-
-        const folderName = folderRelPath ? path.basename(folderRelPath) : repoName;
-        const nameHash = crypto.createHash('sha256').update(folderName).digest('hex');
-
-        const existingFolderRec = itemsByRelPath.get(folderRelPath);
-
-        let folderRes: TransformResult<IbGib_V1>;
-
-        if (existingFolderRec && existingFolderRec.item) {
-            const oldChildAddrs = existingFolderRec.item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
-            const toRemoveChildAddrs = oldChildAddrs.filter(a => !childAddrs.includes(a));
-            const existingComments = existingFolderRec.item.rel8ns?.comment || [];
-
-            folderRes = await evolveB2tFSItemIbGib({
-                existingItem: existingFolderRec.item,
-                dataToUpdate: {
-                    nameHash,
-                },
-                rel8nsToUpdate: {
-                    ...(childAddrs.length > 0 ? { [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs } : {}),
-                    ...(folderCommentAddrs.length > 0 ? { comment: [...existingComments, ...folderCommentAddrs] } : {}),
-                },
-                rel8nsToRemove: toRemoveChildAddrs.length > 0 ? { [B2TFS_CHILD_ITEM_REL8N_NAME]: toRemoveChildAddrs } : undefined,
-            });
-        } else {
-            folderRes = await createB2tFSItemIbGib({
-                fsType: 'folder',
-                name: folderName,
-                data: {
-                    nameHash,
-                },
-                rel8ns: {
-                    ...(childAddrs.length > 0 ? { [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs } : {}),
-                    ...(folderCommentAddrs.length > 0 ? { comment: folderCommentAddrs } : {}),
-                },
-            });
-        }
-
-        const folderItem = folderRes.newIbGib as B2tFSItemIbGib_V1;
-        const folderAddr = getIbGibAddr({ ibGib: folderItem });
-        await persistTransformResult({ resTransform: folderRes, space });
-        await metaspace.registerNewIbGib({ ibGib: folderItem, space });
-
-        createdFolderAddrs.set(folderRelPath, folderAddr);
-
-        if (folderRelPath === '') {
-            rootFolderItem = folderItem;
-            rootFolderAddr = folderAddr;
-        }
-    }
-
-    return { newRootItem: rootFolderItem!, newRootAddr: rootFolderAddr, ingestedCommentCount };
-}
-
-function commitCmd_getParentRelPath(relPath: string): string {
-    const parts = relPath.split('/');
-    parts.pop();
-    return parts.join('/');
-}
-
-async function commitCmd_walkBranchGraph({
-    item,
-    space,
-    metaspace,
-    currentRelPath,
-    outMap,
-}: {
-    item: B2tFSItemIbGib_V1;
-    space: any;
-    metaspace?: any;
-    currentRelPath: string;
-    outMap: Map<string, { itemAddr: string; fsType: 'file' | 'folder'; item?: B2tFSItemIbGib_V1 }>;
-}): Promise<void> {
-    if (!item || !item.data) { return; }
-
-    const { fsType } = item.data;
-    const itemAddr = getIbGibAddr({ ibGib: item });
-
-    outMap.set(currentRelPath, { itemAddr, fsType, item });
-
-    if (fsType === 'folder') {
-        const childAddrs = item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
-        for (const childAddr of childAddrs) {
-            const childItem = await getIbGibWithMetaspaceFallback({
-                addr: childAddr,
-                space,
-                metaspace,
-            }) as B2tFSItemIbGib_V1;
-
-            if (childItem && childItem.data) {
-                const childRelPath = currentRelPath
-                    ? `${currentRelPath}/${childItem.data.name}`
-                    : childItem.data.name;
-                await commitCmd_walkBranchGraph({
-                    item: childItem,
-                    space,
-                    metaspace,
-                    currentRelPath: childRelPath,
-                    outMap,
-                });
-            }
-        }
+        if (logalot) { console.log(`${lc} complete. (I: 7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d)`); }
     }
 }
-// #endregion commitCmd_buildEvolvedRootItem

package/src/cli/commands/commit-log-cmd.respec.mts

@@ -23,9 +23,9 @@ import { executeCheckoutCmd } from './checkout-cmd.mjs';
 import { executeMergeCmd } from './merge-cmd.mjs';
 import { executeGenerateCommentCmd } from './generate-comment-cmd.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getB2tFSIndexIbGib } from '../../engine/index/index-helper.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
+import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { getIbGibWithMetaspaceFallback } from '@ibgib/core-gib/dist/vcs/item/item-helper.mjs';
 
 const lc = `[apps/vcs-gib/src/cli/commands/commit-log-cmd.respec.node.mts]`;
 
@@ -119,7 +119,7 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexAdd = await getB2tFSIndexIbGib({ space: spaceAdd, vcsPath: vcsPathAdd });
+            const indexAdd = await readVcsIndexProjectionFromDisk({ space: spaceAdd, vcsPath: vcsPathAdd });
             iReckon(lc, Boolean(indexAdd?.data?.staged_item && indexAdd.data.staged_item.length > 0)).isGonnaBeTrue();
             iReckon(lc, indexAdd?.rel8ns?.staged_item).isGonnaBeFalsy();
 
@@ -134,7 +134,7 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexCommit = await getB2tFSIndexIbGib({ space: spaceCommit, vcsPath: vcsPathCommit });
+            const indexCommit = await readVcsIndexProjectionFromDisk({ space: spaceCommit, vcsPath: vcsPathCommit });
             iReckon(lc, indexCommit?.data?.staged_item).willEqual([]);
             iReckon(lc, indexCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
 
@@ -458,8 +458,12 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 vcsPath,
                 branchName: 'main',
             });
-            const indexIbGib = await getB2tFSIndexIbGib({ space: metaspace.zeroSpace, vcsPath });
-            const mainBranchAddr = indexIbGib?.rel8ns?.branch?.at(-1) || indexIbGib?.rel8ns?.branch_tjp?.at(-1);
+            const indexIbGib = await readVcsIndexProjectionFromDisk({ space: metaspace.zeroSpace, vcsPath });
+            const branchAddrs = [
+                ...(indexIbGib?.rel8ns?.branch || []),
+                ...(indexIbGib?.rel8ns?.branch_tjp || []),
+            ];
+            const mainBranchAddr = branchAddrs.find(a => a.includes('main')) || branchAddrs.at(-1);
             const mainBranch = await getIbGibWithMetaspaceFallback({ addr: mainBranchAddr!, space: mainSpace, metaspace });
             const mainRootAddr = mainBranch?.rel8ns?.b2tfs_item?.at(-1);
             const mainRoot = await getIbGibWithMetaspaceFallback({ addr: mainRootAddr!, space: mainSpace, metaspace });

package/src/cli/commands/generate-comment-cmd.mts

@@ -11,7 +11,8 @@ import fs from 'node:fs/promises';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { getRepoStatus } from '../../engine/status/status-helper.mjs';
+import { getRepoStatus } from '@ibgib/core-gib/dist/vcs/status/status-helper.mjs';
+import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
 
 const lcFile = `[generate-comment-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
@@ -40,7 +41,7 @@ export async function executeGenerateCommentCmd({
 
     try {
         if (logalot) {
-            console.log(`${lc} starting executeGenerateCommentCmd (I: 8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e)`);
+            console.log(`${lc} starting... (I: 8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
@@ -57,9 +58,12 @@ export async function executeGenerateCommentCmd({
             throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f)`);
         }
 
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
+
         const statusRes = await getRepoStatus({
             metaspace,
             localSpace,
+            indexIbGib,
             vcsPath,
             repoRoot,
             vcsFolderName,