@ibgib/vcs-gib 0.0.30 → 0.0.32

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

@@ -1,25 +1,19 @@
 /**
  * @module init-cmd
  * 
- * Command handler for `vcs init [targetDir]`.
- * Initializes local repository space, root B2tFS folder item, default branch, and in-band space index.
+ * CLI command handler for `vcs init [targetDir]`.
+ * Bootstraps Node environment, creates disk directories, and delegates to executeVcsInit.
  */
 
 import path from 'node:path';
 import fs from 'node:fs/promises';
 
-import { extractErrorMsg, getUUID } 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 { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { executeVcsInit } from '@ibgib/core-gib/dist/vcs/commands/init-cmd.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getB2tFSItemIb } from '../../engine/item/item-atom-helper.mjs';
-import { B2tFSItemIbGib_V1 } from '../../engine/item/item-types.mjs';
-import { createB2tFSBranchIbGib, getB2tFSBranchSpaceName } from '../../engine/branch/branch-helper.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { createB2tFSIndexIbGib, writeVcsIndexProjection } from '../../engine/index/index-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 
 const lcFile = `[init-cmd]`;
@@ -58,7 +52,7 @@ export async function executeInitCmd({
         await fs.mkdir(absTargetDir, { recursive: true });
 
         // Bootstrap Metaspace
-        const { metaspace } = await bootstrapVcsMetaspace({
+        const { metaspace, localSpace } = await bootstrapVcsMetaspace({
             repoPath: absTargetDir,
             vcsFolderName,
             defaultSpaceName: `vcs_${path.basename(absTargetDir).replace(/[^a-zA-Z0-9_\-]/g, '_')}`,
@@ -72,81 +66,34 @@ export async function executeInitCmd({
         });
 
         const folderName = path.basename(absTargetDir) || 'root';
-        const rootNameHash = await getUUID();
-
-        // 1. Create root folder B2tFS item inside b2s_main space
-        const rootItemRes = await Factory_V1.firstGen({
-            parentIbGib: ROOT,
-            ib: getB2tFSItemIb('folder', folderName, rootNameHash),
-            data: {
-                name: folderName,
-                nameHash: rootNameHash,
-                fsType: 'folder',
-                diffTransactionId: await getUUID(),
-                uuid: await getUUID(),
-                classname: 'B2tFSItemIbGib_V1',
-            },
-        });
-
-        const rootItem = rootItemRes.newIbGib as B2tFSItemIbGib_V1;
-        await persistTransformResult({ resTransform: rootItemRes, space: branchSpace });
-        await metaspace.registerNewIbGib({ ibGib: rootItem, space: branchSpace });
 
-        // 2. Create default branch pointing to root folder inside b2s_main space
-        const branchIbGib = await createB2tFSBranchIbGib({
-            branchName: defaultBranchName,
-            rootItem,
-            space: branchSpace,
+        const initRes = await executeVcsInit({
             metaspace,
-        });
-        const branchAddr = getIbGibAddr({ ibGib: branchIbGib });
-
-        // 3. Create space index meta object stored inside b2s_main space
-        const indexIbGib = await createB2tFSIndexIbGib({
-            spaceId,
-            activeSpaceId: getB2tFSBranchSpaceName(defaultBranchName),
-            activeBranch: defaultBranchName,
-            space: branchSpace,
-            metaspace,
-            branchAddr,
-        });
-
-        // 4. Write read-only projection file in .vcsgib/
-        await writeVcsIndexProjection({
-            vcsPath,
-            indexIbGib,
+            branchSpace,
+            localSpace,
+            rootFolderName: folderName,
+            defaultBranchName,
+            vcsFolderName,
         });
 
-        // Clean up legacy out-of-band state files if present
-        try {
-            await fs.rm(path.join(vcsPath, 'vcs_state.json'), { force: true });
-        } catch {
-            // Ignore if missing
-        }
-        try {
-            await fs.rm(path.join(vcsPath, 'staging.json'), { force: true });
-        } catch {
-            // Ignore if missing
-        }
+        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: initRes.indexIbGib });
 
         if (!quiet) {
-            console.log(`Initialized empty ibgib repository in ${vcsPath} (I: 6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f)`);
-            console.log(`  Branch: ${defaultBranchName}`);
-            console.log(`  Root Item: ${rootItem.ib}`);
+            console.log(`Initialized empty ibgib repository in ${vcsPath} (branch: ${defaultBranchName}) (I: 3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f)`);
         }
 
         return {
             vcsPath,
-            spaceId,
-            branchName: defaultBranchName,
-            rootItemIb: rootItem.ib,
+            spaceId: initRes.spaceId,
+            branchName: initRes.branchName,
+            rootItemIb: initRes.rootItem.ib,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 9b10c11d12e13f14a15b16c17d18e19f)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)`);
+            console.log(`${lc} complete. (I: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`);
         }
     }
 }

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

@@ -1,25 +1,20 @@
 /**
  * @module log-cmd
  * 
- * Command handler for `vcs log`.
- * Reads active branch timeline from B2tFSIndexIbGib_V1 in localSpace,
- * walks branch or item timeline history backward, and displays formatted commit and comment history.
+ * CLI command handler for `vcs log`.
+ * Delegates to executeVcsLog and formats console output.
  */
 
 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 { CommentIbGib_V1 } from '@ibgib/core-gib/dist/common/comment/comment-types.mjs';
+import { executeVcsLog } from '@ibgib/core-gib/dist/vcs/commands/log-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 { resolveContextualBranchName } from '../../engine/branch/branch-helper.mjs';
-import { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
-import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
-import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
-import { getB2tFSIndexIbGib, extractBranchNameFromAddr } from '../../engine/index/index-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 
 const lcFile = `[log-cmd]`;
@@ -80,7 +75,7 @@ export async function executeLogCmd({
         }
 
         // 1. Fetch authoritative B2tFSIndexIbGib_V1 directly from localSpace
-        const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
         if (!indexIbGib) {
             throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a)`);
         }
@@ -98,101 +93,22 @@ export async function executeLogCmd({
             branchName,
         });
 
-        // 2. Fetch active branch node address matching active branchName
-        const branchAddrs = indexIbGib.rel8ns?.branch || indexIbGib.rel8ns?.branch_tjp || [];
-
-        let currBranchAddr: string | undefined;
-        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);
-                }
-            }
-
-            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 });
-            }
-        }
-
-        const commits: VcsLogItem[] = [];
-
-        // #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 }) as B2tFSBranchIbGib_V1
-                : 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<string>();
-            let currItem: B2tFSItemIbGib_V1 | undefined = 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,
-                    }) as CommentIbGib_V1;
-
-                    if (commentIbGib) {
-                        commits.push({
-                            commitAddr: itemAddr,
-                            commentAddr: cAddr,
-                            message: commentIbGib.data?.text || '',
-                            timestamp: commentIbGib.data?.textTimestamp || commentIbGib.data?.timestamp || '',
-                            author: 'vcs-user',
-                        });
-                    }
-                }
+        const logRes = await executeVcsLog({
+            metaspace,
+            localSpace,
+            activeBranchSpace: activeSpace,
+            indexIbGib,
+            filePath,
+            allComments,
+            repoRoot,
+            targetDir: absTargetDir,
+        });
 
-                const pastAddr = currItem.rel8ns?.past?.at(0) || currItem.rel8ns?.ancestor?.at(0);
-                if (pastAddr) {
-                    currItem = await getIbGibWithMetaspaceFallback({
-                        addr: pastAddr,
-                        space: activeSpace,
-                        metaspace,
-                    }) as B2tFSItemIbGib_V1;
-                } else {
-                    currItem = undefined;
-                }
-            }
+        const commits: VcsLogItem[] = logRes.commits;
 
-            if (!quiet) {
-                console.log(`File: ${normalizedRelPath} (branch: ${branchName}) (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
+        if (!quiet) {
+            if (logRes.targetPath) {
+                console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
                 if (commits.length === 0) {
                     console.log('No comments found for this file.');
                 } else {
@@ -202,119 +118,25 @@ export async function executeLogCmd({
                         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<string>();
-
-        while (currBranchAddr && !visitedAddrs.has(currBranchAddr)) {
-            visitedAddrs.add(currBranchAddr);
-
-            const branchIbGib = await getIbGibWithMetaspaceFallback({
-                addr: currBranchAddr,
-                space: activeSpace,
-                metaspace,
-            }) as B2tFSBranchIbGib_V1;
-
-            if (!branchIbGib) {
-                break;
-            }
-
-            const rootItemAddr = branchIbGib.rel8ns?.b2tFS_item?.at(-1) || branchIbGib.rel8ns?.b2tfs_item?.at(-1);
-
-            let rootItem: B2tFSItemIbGib_V1 | undefined;
-            if (rootItemAddr) {
-                rootItem = await getIbGibWithMetaspaceFallback({
-                    addr: rootItemAddr,
-                    space: activeSpace,
-                    metaspace,
-                }) as B2tFSItemIbGib_V1;
-            }
-
-            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: primaryCommentAddr,
-                    space: activeSpace,
-                    metaspace,
-                }) as CommentIbGib_V1;
-
-                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: Array<{ path: string; name?: string; message: string }> = [];
-
-            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: currBranchAddr,
-                    commentAddr: primaryCommentAddr,
-                    message: message || '(no commit message)',
-                    timestamp,
-                    author: 'vcs-user',
-                    rootItemAddr,
-                    committedPaths,
-                    itemComments: itemComments.length > 0 ? itemComments : undefined,
-                });
-            }
-
-            // Move to previous branch node in timeline
-            currBranchAddr = branchIbGib.rel8ns?.past?.at(0) || branchIbGib.rel8ns?.ancestor?.at(0);
-        }
-
-        if (!quiet) {
-            console.log(`Branch: ${branchName} (I: 4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b)`);
-            if (commits.length === 0) {
-                console.log('No commits yet.');
             } else {
-                for (const commit of commits) {
-                    console.log(`\ncommit ${commit.commitAddr}`);
-                    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}`);
+                console.log(`Branch: ${logRes.branchName} (I: 4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b)`);
+                if (commits.length === 0) {
+                    console.log('No commits yet.');
+                } else {
+                    for (const commit of commits) {
+                        console.log(`\ncommit ${commit.commitAddr}`);
+                        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}`);
+                            }
                         }
                     }
                 }
@@ -322,10 +144,10 @@ export async function executeLogCmd({
         }
 
         return {
-            branchName,
+            branchName: logRes.branchName,
+            targetPath: logRes.targetPath,
             commits,
         };
-        // #endregion Standard Branch Log Mode
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)} (E: 5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c)`);
         throw error;
@@ -335,115 +157,3 @@ export async function executeLogCmd({
         }
     }
 }
-
-async function logCmd_findItemByPath({
-    rootItemAddr,
-    targetRelPath,
-    space,
-    metaspace,
-}: {
-    rootItemAddr: string;
-    targetRelPath: string;
-    space: any;
-    metaspace?: any;
-}): Promise<B2tFSItemIbGib_V1 | undefined> {
-    const rootItem = await getIbGibWithMetaspaceFallback({
-        addr: rootItemAddr,
-        space,
-        metaspace,
-    }) as B2tFSItemIbGib_V1;
-
-    if (!rootItem) { return undefined; }
-    if (!targetRelPath || targetRelPath === '.' || targetRelPath === '') {
-        return rootItem;
-    }
-
-    const segments = targetRelPath.split('/');
-    let currentItem: B2tFSItemIbGib_V1 = rootItem;
-
-    for (const segment of segments) {
-        if (currentItem.data?.fsType !== 'folder') {
-            return undefined;
-        }
-
-        const childAddrs = currentItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
-        let nextItem: B2tFSItemIbGib_V1 | undefined;
-
-        for (const cAddr of childAddrs) {
-            const child = await getIbGibWithMetaspaceFallback({
-                addr: cAddr,
-                space,
-                metaspace,
-            }) as B2tFSItemIbGib_V1;
-
-            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,
-}: {
-    item: B2tFSItemIbGib_V1;
-    space: any;
-    metaspace?: any;
-    currentRelPath: string;
-    outComments: Array<{ path: string; name?: string; message: string }>;
-}): Promise<void> {
-    if (!item || !item.data) { return; }
-
-    const itemComments = item.rel8ns?.comment || [];
-    for (const cAddr of itemComments) {
-        const commentIbGib = await getIbGibWithMetaspaceFallback({
-            addr: cAddr,
-            space,
-            metaspace,
-        }) as CommentIbGib_V1;
-
-        if (commentIbGib && commentIbGib.data?.text) {
-            outComments.push({
-                path: currentRelPath || '(root)',
-                name: (commentIbGib.data as any)?.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,
-            }) as B2tFSItemIbGib_V1;
-
-            if (childItem && childItem.data) {
-                const childRel = currentRelPath
-                    ? `${currentRelPath}/${childItem.data.name}`
-                    : childItem.data.name;
-                await logCmd_collectAllItemComments({
-                    item: childItem,
-                    space,
-                    metaspace,
-                    currentRelPath: childRel,
-                    outComments,
-                });
-            }
-        }
-    }
-}