@ibgib/vcs-gib 0.0.30 → 0.0.32

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

@@ -1,31 +1,32 @@
 /**
  * @module branch-cmd
- *
- * Command handler for `vcs branch [branchName]`.
- * Lists registered branches or creates a new B2tFSBranchIbGib_V1 node registered in B2tFSIndexIbGib_V1.
+ * 
+ * CLI command handler for `vcs branch [branchName]`.
+ * Delegates to executeVcsBranch and formats terminal output.
  */
 
 import path from 'node:path';
 import fs from 'node:fs/promises';
 
-import { extractErrorMsg, getUUID } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { getIbGibsFromCache_fallbackToSpaces } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-import { putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { executeVcsBranch } from '@ibgib/core-gib/dist/vcs/commands/branch-cmd.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
-import { createB2tFSBranchIbGib } from '../../engine/branch/branch-helper.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { populateBranchSpaceFromGraph } from '../../engine/branch/branch-graph-helper.mjs';
-import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
-import { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
-import { getB2tFSIndexIbGib, updateB2tFSIndexIbGib, getSpaceQualifiedIbGibAddr } from '../../engine/index/index-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { readVcsIndexProjectionFromDisk, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 
 const lcFile = `[branch-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
 
+export interface BranchInfo {
+    name: string;
+    isActive: boolean;
+    addr: string;
+    rootItemAddr?: string;
+}
+
 export interface BranchCmdOpts {
     branchName?: string;
     itemPath?: string;
@@ -34,13 +35,6 @@ export interface BranchCmdOpts {
     quiet?: boolean;
 }
 
-export interface BranchInfo {
-    name: string;
-    isActive: boolean;
-    addr: string;
-    rootItemAddr?: string;
-}
-
 export interface BranchCmdResult {
     branches: BranchInfo[];
     createdBranchName?: string;
@@ -60,7 +54,7 @@ export async function executeBranchCmd({
 
         const absTargetDir = path.resolve(targetDir);
 
-        const { metaspace, localSpace, vcsPath } = await bootstrapVcsMetaspace({
+        const { metaspace, localSpace, vcsPath, repoRoot } = await bootstrapVcsMetaspace({
             repoPath: absTargetDir,
             vcsFolderName,
         });
@@ -73,12 +67,16 @@ export async function executeBranchCmd({
         }
 
         // 1. Fetch authoritative repository index 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: 6e5f4a3b2c1d0e9f8a7b6c5d4e3f2a1b)`);
         }
 
-        const activeBranchName = indexIbGib.data?.activeBranch || 'main';
+        const activeBranchName = resolveContextualBranchName({
+            targetDir: absTargetDir,
+            repoRoot,
+            indexIbGib,
+        });
 
         // Resolve active branch space b2s_<activeBranch>
         const { space: activeBranchSpace } = await getOrCreateBranchSpace({
@@ -87,225 +85,58 @@ export async function executeBranchCmd({
             branchName: activeBranchName,
         });
 
-        // 2. Fetch all registered branch ibgibs
-        const branchAddrs = [
-            ...(indexIbGib.rel8ns?.branch || []),
-            ...(indexIbGib.rel8ns?.branch_tjp || []),
-        ];
-
-        let branchIbGibs: B2tFSBranchIbGib_V1[] = [];
-        if (branchAddrs.length > 0) {
-            for (const bAddr of branchAddrs) {
-                const bIbGib = await getIbGibWithMetaspaceFallback({
-                    addr: bAddr,
-                    space: activeBranchSpace,
-                    metaspace,
-                });
-                if (bIbGib) {
-                    branchIbGibs.push(bIbGib as B2tFSBranchIbGib_V1);
-                }
-            }
-        }
-
-        // Deduplicate branch nodes by branch name
-        const branchMap = new Map<string, B2tFSBranchIbGib_V1>();
-        for (const b of branchIbGibs) {
-            if (b?.data?.name) {
-                branchMap.set(b.data.name, b);
-            }
-        }
-
-        const trimmedBranchName = branchName?.trim();
-
-        if (!trimmedBranchName) {
-            // LIST BRANCHES
-            const branches: BranchInfo[] = [];
-            for (const [name, bNode] of branchMap.entries()) {
-                const addr = getIbGibAddr({ ibGib: bNode });
-                const rootItemAddr = bNode.rel8ns?.b2tfs_item?.at(-1);
-                const isActive = name === activeBranchName;
-                branches.push({
-                    name,
-                    isActive,
-                    addr,
-                    rootItemAddr,
-                });
-            }
-
-            if (!quiet) {
-                for (const b of branches) {
-                    const prefix = b.isActive ? '* ' : '  ';
-                    console.log(`${prefix}${b.name}`);
-                }
-            }
-
-            return { branches };
-
-        }
-
-        // CREATE BRANCH
-        if (branchMap.has(trimmedBranchName)) {
-            throw new Error(`Branch '${trimmedBranchName}' already exists (E: 7f6a5b4c3d2e1f0a9b8c7d6e5f4a3b2c)`);
-        }
-
-        // Find active branch root item to fork from
-        const activeBranchIbGib = branchMap.get(activeBranchName) || branchIbGibs.at(0);
-        const rootItemAddr = activeBranchIbGib?.rel8ns?.b2tfs_item?.at(-1);
-
-        if (!rootItemAddr) {
-            throw new Error(`Cannot find active branch root item to fork branch from (E: 8f7e6d5c4b3a2f1e0d9c8b7a6f5e4d3c)`);
-        }
-
-        const rootItem = await getIbGibWithMetaspaceFallback({
-            addr: rootItemAddr,
-            space: activeBranchSpace,
-            metaspace,
-        }) as B2tFSItemIbGib_V1;
-
-        if (!rootItem) {
-            throw new Error(`Root item node for address '${rootItemAddr}' not found in localSpace (E: 9b8c7d6e5f4a3b2c1d0e9f8a7b6c5d4e)`);
-        }
-
-        let targetRootItem: B2tFSItemIbGib_V1 = rootItem;
-        if (itemPath && itemPath.trim().length > 0) {
-            const normalizedItemPath = itemPath.trim().replace(/\\/g, '/').replace(/^\.\//, '');
-            const committedBranchItemsMap = new Map<string, B2tFSItemIbGib_V1>();
-            await executeBranchCmd_walkBranchGraphForItems({
-                item: rootItem,
-                space: activeBranchSpace,
+        // If creating a branch, ensure target branch space exists on Node
+        if (branchName && branchName.trim().length > 0) {
+            await getOrCreateBranchSpace({
                 metaspace,
-                currentRelPath: '',
-                outMap: committedBranchItemsMap,
+                vcsPath,
+                branchName: branchName.trim(),
             });
-
-            const targetItemNode = committedBranchItemsMap.get(normalizedItemPath);
-            if (!targetItemNode) {
-                throw new Error(`Item '${itemPath}' not found in active branch snapshot (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c)`);
-            }
-            targetRootItem = targetItemNode;
         }
 
-        // Instantiate new branch space b2s_<newBranch>
-        const { space: newBranchSpace, spaceId: newBranchSpaceId } = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: trimmedBranchName,
-        });
-
-        // Populate new branch space from live dependency graph of targetRootItem
-        await populateBranchSpaceFromGraph({
-            sourceSpace: activeBranchSpace,
-            targetBranchSpace: newBranchSpace,
-            rootItemIbGib: targetRootItem,
-            metaspace,
-        });
-
-        // Create new B2tFSBranchIbGib_V1 branch node inside newBranchSpace
-        const newBranchIbGib = await createB2tFSBranchIbGib({
-            branchName: trimmedBranchName,
-            rootItem: targetRootItem,
-            space: newBranchSpace,
-            metaspace,
-        });
-
-        // Put in activeBranchSpace so active index can reference it
-        await putInSpace({ space: activeBranchSpace, ibGib: newBranchIbGib });
-
-        const newBranchAddr = getIbGibAddr({ ibGib: newBranchIbGib });
-        const sqNewBranchAddr = getSpaceQualifiedIbGibAddr({
-            spaceId: newBranchSpaceId,
-            ibGibAddr: newBranchAddr,
-        });
-
-        // Register new branch node in B2tFSIndexIbGib_V1 using space-qualified address
-        await updateB2tFSIndexIbGib({
-            space: activeBranchSpace,
+        const branchRes = await executeVcsBranch({
             metaspace,
+            localSpace,
+            activeBranchSpace,
             indexIbGib,
-            rel8nsToUpdate: {
-                branch: [sqNewBranchAddr],
-                branch_tjp: [sqNewBranchAddr],
-            },
-            vcsPath,
+            branchName,
+            itemPath,
+            repoRoot,
+            targetDir: absTargetDir,
+            vcsFolderName,
         });
 
-        if (!quiet) {
-            console.log(`Created branch '${trimmedBranchName}' (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5e)`);
+        if (branchRes.updatedIndex) {
+            await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: branchRes.updatedIndex });
         }
 
-        // Return updated branch list
-        branchMap.set(trimmedBranchName, newBranchIbGib);
-        const branches: BranchInfo[] = [];
-        for (const [name, bNode] of branchMap.entries()) {
-            const addr = getIbGibAddr({ ibGib: bNode });
-            const itemAddr = bNode.rel8ns?.b2tfs_item?.at(0);
-            branches.push({
-                name,
-                isActive: name === activeBranchName,
-                addr,
-                rootItemAddr: itemAddr,
-            });
+        const branches: BranchInfo[] = branchRes.branches.map(b => ({
+            name: b.name,
+            isActive: b.isActive,
+            addr: b.commitAddr || '',
+            rootItemAddr: b.rootItemAddr,
+        }));
+
+        if (!quiet) {
+            if (!branchName) {
+                for (const b of branches) {
+                    const prefix = b.isActive ? '* ' : '  ';
+                    console.log(`${prefix}${b.name}`);
+                }
+            } else {
+                console.log(`Created branch '${branchRes.createdBranchName}'`);
+            }
         }
 
         return {
             branches,
-            createdBranchName: trimmedBranchName,
-            createdBranchAddr: newBranchAddr,
+            createdBranchName: branchRes.createdBranchName,
+            createdBranchAddr: branchRes.createdBranchAddr,
         };
     } catch (error) {
         console.error(`${lc} ${extractErrorMsg(error)} (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)`);
         throw error;
     } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b)`);
-        }
-    }
-}
-
-// #region executeBranchCmd_walkBranchGraphForItems
-async function executeBranchCmd_walkBranchGraphForItems({
-    item,
-    space,
-    metaspace,
-    currentRelPath,
-    outMap,
-}: {
-    item: B2tFSItemIbGib_V1;
-    space: any;
-    metaspace?: any;
-    currentRelPath: string;
-    outMap: Map<string, B2tFSItemIbGib_V1>;
-}): Promise<void> {
-    if (!item || !item.data) { return; }
-
-    const { fsType } = item.data;
-
-    if (currentRelPath) {
-        outMap.set(currentRelPath, 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 executeBranchCmd_walkBranchGraphForItems({
-                    item: childItem,
-                    space,
-                    metaspace,
-                    currentRelPath: childRelPath,
-                    outMap,
-                });
-            }
-        }
+        if (logalot) { console.log(`${lc} complete. (I: 2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b)`); }
     }
 }
-// #endregion executeBranchCmd_walkBranchGraphForItems

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

@@ -1,26 +1,20 @@
 /**
  * @module checkout-cmd
  * 
- * Command handler for `vcs checkout <branchName>`.
- * Switches activeBranch in B2tFSIndexIbGib_V1 in localSpace and projects branch snapshot onto worktree path.
+ * CLI command handler for `vcs checkout <branchName>`.
+ * Bootstraps workspace projection space, delegates to executeVcsCheckout, and writes projection cache.
  */
 
 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 { getIbGibsFromCache_fallbackToSpaces } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-import { putInSpace, getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-
+import { executeVcsCheckout } from '@ibgib/core-gib/dist/vcs/commands/checkout-cmd.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
-import { getB2tFSBranchSpaceName } from '../../engine/branch/branch-helper.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 { writeB2tFSItemToFS, getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
-import { getB2tFSIndexIbGib, updateB2tFSIndexIbGib } from '../../engine/index/index-helper.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 = `[checkout-cmd]`;
@@ -36,8 +30,6 @@ export interface CheckoutCmdOpts {
 export interface CheckoutCmdResult {
     previousBranch: string;
     currentBranch: string;
-    branchAddr: string;
-    rootItemAddr: string;
     worktreePath: string;
 }
 
@@ -49,9 +41,7 @@ export async function executeCheckoutCmd({
 }: CheckoutCmdOpts = {}): Promise<CheckoutCmdResult> {
     const lc = `${lcFile}[${executeCheckoutCmd.name}]`;
     try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: 3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8e)`);
-        }
+        if (logalot) { console.log(`${lc} starting... (I: 3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e)`); }
 
         const trimmedBranchName = branchName?.trim();
         if (!trimmedBranchName) {
@@ -73,44 +63,12 @@ export async function executeCheckoutCmd({
         }
 
         // 1. Fetch authoritative repository index 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: 6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f)`);
         }
 
-        const previousBranch = indexIbGib.data?.activeBranch || 'main';
-
-        // 2. Fetch all registered branch ibgibs
-        const branchAddrs = [
-            ...(indexIbGib.rel8ns?.branch || []),
-            ...(indexIbGib.rel8ns?.branch_tjp || []),
-        ];
-
-        let branchIbGibs: B2tFSBranchIbGib_V1[] = [];
-        if (branchAddrs.length > 0) {
-            for (const bAddr of branchAddrs) {
-                const bIbGib = await getIbGibWithMetaspaceFallback({
-                    addr: bAddr,
-                    space: localSpace,
-                    metaspace,
-                });
-                if (bIbGib) {
-                    branchIbGibs.push(bIbGib as B2tFSBranchIbGib_V1);
-                }
-            }
-        }
-
-        // Find target branch node
-        const targetBranchIbGib = branchIbGibs.findLast(
-            (b) => b?.data?.name === trimmedBranchName,
-        );
-
-
-        if (!targetBranchIbGib) {
-            throw new Error(`Branch '${trimmedBranchName}' does not exist (E: 7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a)`);
-        }
-
-        // 3. Resolve target branch space b2s_<branchName>
+        // 2. Resolve target branch space b2s_<branchName>
         const targetBranchSpaceRes = await getOrCreateBranchSpace({
             metaspace,
             vcsPath,
@@ -118,47 +76,6 @@ export async function executeCheckoutCmd({
         });
         const targetBranchSpace = targetBranchSpaceRes.space;
 
-        const targetBranchAddr = getIbGibAddr({ ibGib: targetBranchIbGib });
-        const targetBranchTjpAddr = targetBranchIbGib.rel8ns?.tjp?.at(0) || targetBranchAddr;
-        const latestTargetBranchRes = await getLatestAddrs({ space: targetBranchSpace, addrs: [targetBranchTjpAddr] });
-        const latestTargetBranchAddr = (latestTargetBranchRes?.data as any)?.latestAddrs?.[0] || targetBranchAddr;
-
-
-        const latestTargetBranchIbGib = (await getIbGibWithMetaspaceFallback({
-            addr: latestTargetBranchAddr,
-            space: targetBranchSpace,
-            metaspace,
-        })) as B2tFSBranchIbGib_V1 || targetBranchIbGib;
-
-        const rootItemAddr = latestTargetBranchIbGib.rel8ns?.b2tfs_item?.at(-1);
-
-        if (!rootItemAddr) {
-            throw new Error(`Branch '${trimmedBranchName}' does not have a valid root item address (E: 8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b)`);
-        }
-
-
-        await putInSpace({ space: targetBranchSpace, ibGib: targetBranchIbGib });
-
-        // Update activeBranch in B2tFSIndexIbGib_V1 in targetBranchSpace and localSpace
-        const updatedIndex = await updateB2tFSIndexIbGib({
-            space: targetBranchSpace,
-            metaspace,
-            indexIbGib,
-            dataToUpdate: {
-                activeBranch: trimmedBranchName,
-                activeSpaceId: getB2tFSBranchSpaceName(trimmedBranchName),
-                mySpaceId: targetBranchSpaceRes.spaceId,
-            },
-            vcsPath,
-        });
-
-        if (localSpace !== targetBranchSpace) {
-            await putInSpace({ space: localSpace, ibGib: updatedIndex });
-        }
-
-        // 4. Project branch snapshot onto worktree subfolder:
-        //    'main' -> repoRoot
-        //    other branches -> repoRoot/b/<branch_name>/
         const isDefaultBranch = trimmedBranchName === 'main';
         const worktreePath = isDefaultBranch
             ? repoRoot
@@ -166,62 +83,41 @@ export async function executeCheckoutCmd({
 
         await fs.mkdir(worktreePath, { recursive: true });
 
-        // Retrieve root item and project branch snapshot onto worktree subfolder:
-        // If rootItem is a single file, write it directly to worktreePath (my-repo/b/<branchName>/<fileName>).
-        // If rootItem is a folder, write child items into worktreePath.
-        const rootItem = await getIbGibWithMetaspaceFallback({
-            addr: rootItemAddr,
-            space: targetBranchSpace,
+        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
             metaspace,
-        }) as B2tFSItemIbGib_V1;
-
-        if (rootItem) {
-            if (rootItem.data?.fsType === 'file') {
-                await writeB2tFSItemToFS({
-                    item: rootItem,
-                    destPath: worktreePath,
-                    space: targetBranchSpace,
-                    metaspace,
-                });
-            } else {
-                const childAddrs = rootItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
-                for (const childAddr of childAddrs) {
-                    const childItem = await getIbGibWithMetaspaceFallback({
-                        addr: childAddr,
-                        space: targetBranchSpace,
-                        metaspace,
-                    }) as B2tFSItemIbGib_V1;
-
-                    if (childItem) {
-                        await writeB2tFSItemToFS({
-                            item: childItem,
-                            destPath: worktreePath,
-                            space: targetBranchSpace,
-                            metaspace,
-                        });
-                    }
-                }
-            }
-        }
+            workspaceRoot: worktreePath,
+            vcsFolderName,
+            backingSpace: targetBranchSpace,
+        });
+
+        const checkoutRes = await executeVcsCheckout({
+            metaspace,
+            localSpace,
+            targetBranchSpace,
+            workspaceSpace,
+            indexIbGib,
+            branchName: trimmedBranchName,
+            repoRoot,
+            targetDir: absTargetDir,
+            vcsFolderName,
+        });
+
+        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: checkoutRes.updatedIndex });
 
         if (!quiet) {
-            console.log(`Switched to branch '${trimmedBranchName}' (I: 9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c)`);
-            console.log(`  Worktree projection: ${worktreePath}`);
+            console.log(`Switched to branch '${trimmedBranchName}' (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)`);
+            console.log(`Worktree path: ${worktreePath}`);
         }
 
         return {
-            previousBranch,
-            currentBranch: trimmedBranchName,
-            branchAddr: targetBranchAddr,
-            rootItemAddr,
+            previousBranch: checkoutRes.previousBranch,
+            currentBranch: checkoutRes.currentBranch,
             worktreePath,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
         throw error;
     } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e)`);
-        }
+        if (logalot) { console.log(`${lc} complete. (I: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`); }
     }
 }