@ibgib/vcs-gib 0.0.36 → 0.0.41

package/VCS_CLI_USER_GUIDE.md

@@ -17,8 +17,9 @@ The global CLI executable command is **`ibgib`** (or its alias **`vcs`**).
 2. **First-Class In-Band Comments (`CommentIbGib_V1`)**:
    - Comments can be attached at the repository commit level (`-m "message"`) and at the individual file/folder level using companion notes (`.ib.<filename>.md`).
    - File comments form persistent, immutable comment timelines linked directly to item DAG nodes.
-3. **Upward `.vcsgib` Discovery**:
+3. **Upward `.vcsgib` Discovery & Contextual Branch Resolution**:
    - Running `ibgib` commands inside any subfolder or worktree directory (e.g. `cd b/feature-login` or `cd src/`) automatically walks parent directories to find `.vcsgib` and locate the repository root (`repoRoot`).
+   - Commands like `ibgib status`, `ibgib log`, `ibgib add`, and `ibgib commit` dynamically determine the active branch based on whether the working directory is inside a dedicated branch worktree (`b/<branchName>`) or the repository root (`main`).
 4. **1-to-1 Worktree Alignment**:
    - Root folder `my-repo/` $\longleftrightarrow$ Space `b2s_main`.
    - Subfolder `my-repo/b/<branch>/` $\longleftrightarrow$ Space `b2s_<branch>`.
@@ -43,14 +44,16 @@ After executing `npm run build:for:test`, downstream integration test suites run
 | Command | Syntax | Description | Example |
 | :--- | :--- | :--- | :--- |
 | **`init`** | `ibgib init [dir]` | Initializes a new `ibgib` repository in target directory. Scopes `.vcsgib/ibgib/b2s_main/` space, root folder node, `main` branch, and in-band index. | `ibgib init .`<br>`ibgib init my-repo` |
-| **`status`** | `ibgib status` | Displays working tree status: untracked files, modified files, deleted files, staged items, and active companion comment files (`.ib.*.md`) on active branch space. | `ibgib status` |
+| **`status`** | `ibgib status [-c]` | Displays working tree status: untracked files, modified files, deleted files, staged items, and active companion comment files (`.ib.*.md`) on active branch space. Use `-c` or `--comments` to display full comment contents. | `ibgib status`<br>`ibgib status -c` |
+| **`generate-comment`** | `ibgib generate-comment <path>`<br>*(aliases: `gmsg`, `gcomm`, `gen-msg`, `gen-comment`)* | Creates a companion note file `.ib.<basename>.md` in `<path>`'s directory pre-populated with conventional-commit markdown template. | `ibgib generate-comment src/auth.ts`<br>`ibgib gmsg src/app.ts` |
 | **`add`** | `ibgib add <path...>`<br>`ibgib add -a` | Stages file/folder candidate nodes and binary payloads into active branch space index (`B2tFSIndexIbGib_V1`). Use `-a` or `--all` to stage everything. | `ibgib add src/index.ts`<br>`ibgib add -a` |
-| **`generate-comment`** | `ibgib generate-comment <path>` | Creates a companion note file `.ib.<basename>.md` in `<path>`'s directory pre-populated with conventional-commit markdown template. | `ibgib generate-comment src/auth.ts` |
 | **`commit`** | `ibgib commit [-m "msg"]` | Records snapshot in active branch space. Ingests companion files (`.ib.*.md`) onto individual file items and/or attaches `-m` comment to root item. Cleans up companion files and advances branch tip. | `ibgib commit -m "Initial commit"`<br>`ibgib commit` *(using companion notes)* |
-| **`log`** | `ibgib log [filePath]` | Omitted `filePath`: displays commit history walking backward along active branch timeline.<br>Provided `filePath`: displays file-specific history and attached file-level companion comments. | `ibgib log`<br>`ibgib log src/auth.ts` |
-| **`branch`** | `ibgib branch [name] [itemPath]` | Omitted `name`: lists registered branches.<br>Provided `name`: creates dedicated branch space `b2s_<name>` via SSM sync.<br>Optional `itemPath`: branches a single file directly (`ibgib branch math-opt src/math.js`) instead of root folder. | `ibgib branch`<br>`ibgib branch feature-ui`<br>`ibgib branch math-opt src/math.js` |
-| **`checkout`** | `ibgib checkout <branch>` | Switches active branch in index and materializes branch snapshot onto target worktree directory (`my-repo/` if main, `b/<branch>/` if secondary). Handles folder-root and file-root projections cleanly. | `ibgib checkout main`<br>`ibgib checkout feature-ui` |
+| **`log`** | `ibgib log`<br>`ibgib log [branch]`<br>`ibgib log -b <branch>`<br>`ibgib log <filePath> [-a]` | **Default (no args)**: Displays commit history in reverse chronological order for the current branch (contextually inferred from cwd/worktree).<br>**Branch name / `-b`**: Displays commit history for the specified branch.<br>**File path**: Displays commit history and companion comments for a specific file (use `-a` / `--all` for all comments). | `ibgib log`<br>`ibgib log -b feature-ui`<br>`ibgib log feature-ui`<br>`ibgib log src/auth.ts` |
+| **`branch`** | `ibgib branch [name] [itemPath]` | Omitted `name`: lists registered branches and marks the active branch.<br>Provided `name`: creates dedicated branch space `b2s_<name>` via SSM sync.<br>Optional `itemPath`: branches a single file directly (`ibgib branch math-opt src/math.js`) instead of root folder. | `ibgib branch`<br>`ibgib branch feature-ui`<br>`ibgib branch math-opt src/math.js` |
+| **`checkout`** | `ibgib checkout <branch> [-f]` | Switches active branch in index and materializes branch snapshot onto target worktree directory (`my-repo/` if main, `b/<branch>/` if secondary). Use `-f` or `--force` to overwrite uncommitted files. | `ibgib checkout main`<br>`ibgib checkout feature-ui` |
 | **`merge`** | `ibgib merge <incomingBranch>` | Performs 3-way merge of `incomingBranch` into active branch using `SyncSagaCoordinator`. Reconciles file conflicts, unions file comments across branches, and updates branch root pointer. | `ibgib merge feature-ui` |
+| **`reset`** | `ibgib reset [path...]`<br>`ibgib reset -a` | Unstages specified paths or all staged items (`-a`, `--all`) from the index. | `ibgib reset src/index.ts`<br>`ibgib reset -a` |
+| **`restore`** | `ibgib restore [path...]`<br>`ibgib restore --staged [path...]`<br>`ibgib restore --worktree [path...]` | Discards changes by unstaging files (`--staged`) and/or reverting physical working tree files (`--worktree`) back to the latest branch snapshot. | `ibgib restore src/index.ts`<br>`ibgib restore --staged src/app.ts`<br>`ibgib restore --worktree src/app.ts` |
 
 ---
 
@@ -186,11 +189,24 @@ ibgib merge feature-b
 
 ### Step 6: Inspect repository and file logs
 ```bash
-# View full branch commit log
+# View full branch commit log on main (includes merged commits from feature-b)
 ibgib log
 
+# View commit history from inside a dedicated worktree directory
+cd b/feature-b
+ibgib log
+
+# View a specific branch's commit history from anywhere
+cd ../..
+ibgib log -b feature-b
+# Or using positional branch argument:
+ibgib log feature-b
+
 # View file-specific comment history for index.ts
 ibgib log index.ts
+
+# View file-specific history including all companion comments
+ibgib log index.ts -a
 ```
 
 ---

package/dist/AUTO-GENERATED-version.d.mts

@@ -2,5 +2,5 @@
  * @module AUTO-GENERATED-version
  * Auto-generated version constant. Do NOT edit directly.
  */
-export declare const AUTO_GENERATED_VERSION = "0.0.36";
+export declare const AUTO_GENERATED_VERSION = "0.0.41";
 //# sourceMappingURL=AUTO-GENERATED-version.d.mts.map

package/dist/AUTO-GENERATED-version.mjs

@@ -2,5 +2,5 @@
  * @module AUTO-GENERATED-version
  * Auto-generated version constant. Do NOT edit directly.
  */
-export const AUTO_GENERATED_VERSION = '0.0.36';
+export const AUTO_GENERATED_VERSION = '0.0.41';
 //# sourceMappingURL=AUTO-GENERATED-version.mjs.map

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

@@ -14,11 +14,11 @@ export async function executeCheckoutCmd({ branchName, force = false, targetDir
     const lc = `${lcFile}[${executeCheckoutCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: 1cd9d2565ff16c18e82d7802ea033226)`);
         }
         const trimmedBranchName = branchName?.trim();
         if (!trimmedBranchName) {
-            throw new Error(`Branch name is required for checkout (E: genuuid)`);
+            throw new Error(`Branch name is required for checkout (E: 16edcde284b7fdfb05547c829fda5d26)`);
         }
         const absTargetDir = path.resolve(targetDir);
         const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
@@ -28,7 +28,7 @@ export async function executeCheckoutCmd({ branchName, force = false, targetDir
             targetDir: absTargetDir,
         });
         if (!quiet) {
-            console.log(`Switched to branch '${checkoutRes.currentBranch}' (I: genuuid)`);
+            console.log(`Switched to branch '${checkoutRes.currentBranch}' (I: f73f287d3271149058e5ee9851392726)`);
             console.log(`Worktree path: ${checkoutRes.worktreePath}`);
         }
         return {
@@ -38,12 +38,12 @@ export async function executeCheckoutCmd({ branchName, force = false, targetDir
         };
     }
     catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 008fbfd6f9f8eb496854b4edc55ea726)`);
         throw error;
     }
     finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: d515f834dd18286f2fe1871605888c26)`);
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"cli-checkout-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-checkout-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAgBjC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACrC,UAAU,EACV,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAoB,EAAE;IACnB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC;IACnD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;QAAC,CAAC;QAE/D,MAAM,iBAAiB,GAAG,UAAU,EAAE,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAErF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YACpC,UAAU,EAAE,iBAAiB;YAC7B,KAAK;YACL,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,uBAAuB,WAAW,CAAC,aAAa,gBAAgB,CAAC,CAAC;YAC9E,OAAO,CAAC,GAAG,CAAC,kBAAkB,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO;YACH,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,YAAY,EAAE,WAAW,CAAC,YAAY;SACzC,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;QAAC,CAAC;IACjE,CAAC;AACL,CAAC"}
+{"version":3,"file":"cli-checkout-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-checkout-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAgBjC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACrC,UAAU,EACV,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAoB,EAAE;IACnB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC;IACnD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAAC,CAAC;QAExF,MAAM,iBAAiB,GAAG,UAAU,EAAE,IAAI,EAAE,CAAC;QAC7C,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAClG,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAErF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;YACpC,UAAU,EAAE,iBAAiB;YAC7B,KAAK;YACL,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,uBAAuB,WAAW,CAAC,aAAa,yCAAyC,CAAC,CAAC;YACvG,OAAO,CAAC,GAAG,CAAC,kBAAkB,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,OAAO;YACH,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,YAAY,EAAE,WAAW,CAAC,YAAY;SACzC,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;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QAAC,CAAC;IAC1F,CAAC;AACL,CAAC"}

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

@@ -23,6 +23,7 @@ export interface LogCmdOpts {
     targetDir?: string;
     vcsFolderName?: string;
     filePath?: string;
+    branchName?: string;
     allComments?: boolean;
     quiet?: boolean;
 }
@@ -31,5 +32,5 @@ export interface LogCmdResult {
     targetPath?: string;
     commits: VcsLogItem[];
 }
-export declare function executeLogCmd({ targetDir, vcsFolderName, filePath, allComments, quiet, }?: LogCmdOpts): Promise<LogCmdResult>;
+export declare function executeLogCmd({ targetDir, vcsFolderName, filePath, branchName, allComments, quiet, }?: LogCmdOpts): Promise<LogCmdResult>;
 //# sourceMappingURL=cli-log-cmd.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cli-log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,EAChC,SAAyB,EACzB,aAAyB,EACzB,QAAQ,EACR,WAAmB,EACnB,KAAa,GAChB,GAAE,UAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CA0EzC"}
+{"version":3,"file":"cli-log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,EAChC,SAAyB,EACzB,aAAyB,EACzB,QAAQ,EACR,UAAU,EACV,WAAmB,EACnB,KAAa,GAChB,GAAE,UAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CA2FzC"}

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

@@ -6,25 +6,38 @@
  */
 import path from 'node:path';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-// import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 import { openVcsRepository } from '../vcs-repo-helper.mjs';
 const lcFile = `[log-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
-export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', filePath, allComments = false, quiet = false, } = {}) {
+export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', filePath, branchName, allComments = false, quiet = false, } = {}) {
     const lc = `${lcFile}[${executeLogCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting executeLogCmd (I: genuuid)`);
+            console.log(`${lc} starting executeLogCmd (I: c6920dc083bff49d8b4dd148a36de826)`);
         }
         const absTargetDir = path.resolve(targetDir);
         const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
         const indexIbGib = await repo.getIndexIbGib();
-        const activeBranchSpace = await repo.getActiveBranchSpace(indexIbGib);
+        // let resolvedBranchName = branchName;
+        // let resolvedFilePath = filePath;
+        // if (!resolvedBranchName && resolvedFilePath) {
+        //     const branchInfos = await getAllBranchInfosFromIndex({ indexIbGib });
+        //     if (branchInfos.some(b => b.branchName === resolvedFilePath)) {
+        //         resolvedBranchName = resolvedFilePath;
+        //         resolvedFilePath = undefined;
+        //     }
+        // }
+        // const activeBranchSpace = await repo.getActiveBranchSpace({
+        //     indexIbGib,
+        //     targetDir: absTargetDir,
+        //     branchName: resolvedBranchName,
+        // });
         const logRes = await repo.log({
-            activeBranchSpace,
             indexIbGib,
-            // repoRoot, // need this? we need jsdocs on wth repoRoot is
+            // branchName: resolvedBranchName,
+            branchName,
+            // filePath: resolvedFilePath,
             filePath,
             allComments,
             targetDir: absTargetDir,
@@ -32,7 +45,7 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
         const commits = logRes.commits;
         if (!quiet) {
             if (logRes.targetPath) {
-                console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: genuuid)`);
+                console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: 5b56b87941a81ed7e9036f382ca80326)`);
                 if (commits.length === 0) {
                     console.log('No comments found for this file.');
                 }
@@ -47,7 +60,7 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
                 }
             }
             else {
-                console.log(`Branch: ${logRes.branchName} (I: genuuid)`);
+                console.log(`Branch: ${logRes.branchName} (I: da4a28fe715c302be839ad08d9f0ca26)`);
                 if (commits.length === 0) {
                     console.log('No commits yet.');
                 }
@@ -78,12 +91,12 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
         };
     }
     catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: f279d589ced70f7e78050948f2191e26)`);
         throw error;
     }
     finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: 081e084ef158f7a608fd16a801bedf26)`);
         }
     }
 }

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"cli-merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,YAAY;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,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,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CA0D7C"}
+{"version":3,"file":"cli-merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,YAAY;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,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,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwD7C"}

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

@@ -16,32 +16,30 @@ export async function executeMergeCmd({ incomingBranchName, targetDir = process.
     const lc = `${lcFile}[${executeMergeCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: d14fb7ac187875d165abcbf8fe51ce26)`);
         }
         const trimmedIncomingBranchName = incomingBranchName?.trim();
         if (!trimmedIncomingBranchName) {
-            throw new Error(`Branch name is required for merge (E: genuuid)`);
+            throw new Error(`Branch name is required for merge (E: f47fd65e49a8518da859217ae1bef826)`);
         }
         const absTargetDir = path.resolve(targetDir);
         const { repo, vcsPath, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
-        // todo: get baseBranchName based off of targetDir?
-        const baseBranchName = await repo.getActiveBranchName();
+        const indexIbGib = await repo.getIndexIbGib();
+        const baseBranchName = await repo.getActiveBranchName({ indexIbGib, targetDir: absTargetDir });
         const incomingSpaceRes = await getOrCreateBranchSpace({
             metaspace: repo.metaspace,
             branchName: trimmedIncomingBranchName,
         });
-        const activeBranchSpace = await repo.getActiveBranchSpace();
+        const activeBranchSpace = await repo.getActiveBranchSpace({ indexIbGib, targetDir: absTargetDir });
         const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
         const mergeRes = await repo.merge({
-            baseBranchSpace: activeBranchSpace, // what should this be? always the active one? Or does the working dir determine it? What is absTargetDir?
-            // message,
-            // repoRoot,
+            baseBranchSpace: activeBranchSpace,
             incomingBranchName: trimmedIncomingBranchName,
             incomingBranchSpace: incomingSpaceRes.space,
             targetDir: absTargetDir,
         });
         if (!quiet) {
-            console.log(`Successfully merged branch '${trimmedIncomingBranchName}' into '${baseBranchName}' (I: genuuid)`);
+            console.log(`Successfully merged branch '${trimmedIncomingBranchName}' into '${baseBranchName}' (I: 943c67d40bb8a3177d470da667571726)`);
             console.log(`  Worktree projection: ${activeWorktreeDir}`);
         }
         return {
@@ -54,12 +52,12 @@ export async function executeMergeCmd({ incomingBranchName, targetDir = process.
         };
     }
     catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: acfb283f49f8e533586e0578ac9d4426)`);
         throw error;
     }
     finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: 67210ef7c05454c19cdb6b08149b7326)`);
         }
     }
 }

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

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

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

@@ -4,7 +4,7 @@
  * CLI command handler for `vcs status`.
  * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
  */
-import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-helper.mjs';
+import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-types.mjs';
 export { VcsStatusItem, PendingCommentInfo };
 export interface StatusCmdResult {
     branchName: string;

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

@@ -1 +1 @@
-{"version":3,"file":"cli-status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAOtG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,eAAe,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,QAAgB,GACnB,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA0F/C"}
+{"version":3,"file":"cli-status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAOrG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,eAAe,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,QAAgB,GACnB,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA0F/C"}

package/dist/cli/vcs-cli-main.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAwIpC"}
+{"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0IpC"}

package/dist/cli/vcs-cli-main.mjs

@@ -111,9 +111,11 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
             case VCS_SUBCOMMANDS.LOG: {
                 const targetDir = process.cwd();
                 const filePath = parsed.positionals[0];
+                const branchName = parsed.flags.branchName;
                 await executeLogCmd({
                     targetDir,
                     filePath,
+                    branchName,
                     allComments: parsed.flags.all,
                 });
                 break;

package/dist/cli/vcs-cli-main.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/vcs-gib",
-  "version": "0.0.36",
+  "version": "0.0.41",
   "private": false,
   "type": "module",
   "main": "dist/index.mjs",
@@ -22,7 +22,7 @@
     "@ibgib/helper-gib": "^0.0.39",
     "@ibgib/ts-gib": "^0.5.36",
     "@ibgib/encrypt-gib": "^0.3.3",
-    "@ibgib/core-gib": "^0.1.81",
-    "@ibgib/node-gib": "^0.0.26"
+    "@ibgib/core-gib": "^0.1.83",
+    "@ibgib/node-gib": "^0.0.28"
   }
 }

package/src/AUTO-GENERATED-version.mts

@@ -2,4 +2,4 @@
  * @module AUTO-GENERATED-version
  * Auto-generated version constant. Do NOT edit directly.
  */
-export const AUTO_GENERATED_VERSION = '0.0.36';
+export const AUTO_GENERATED_VERSION = '0.0.41';

package/src/cli/cli-e2e.respec.mts

@@ -21,6 +21,7 @@ import { executeCommitCmd } from './commands/cli-commit-cmd.mjs';
 import { executeLogCmd } from './commands/cli-log-cmd.mjs';
 import { executeBranchCmd } from './commands/cli-branch-cmd.mjs';
 import { executeCheckoutCmd } from './commands/cli-checkout-cmd.mjs';
+import { executeMergeCmd } from './commands/cli-merge-cmd.mjs';
 import { bootstrapVcsMetaspace } from '../bootstrap/node-bootstrap.mjs';
 import { getB2tFSIndexIbGib } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
 
@@ -430,6 +431,36 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
             iReckon(lc, logRes.commits.length).willEqual(2);
             iReckon(lc, logRes.commits[0].message).willEqual('Commit on feature');
             iReckon(lc, logRes.commits[1].message).willEqual('Commit on main');
+
+            // 7. Verify explicit -b flag logs feature-strings from repo root
+            const rootLogExplicitBranchRes = await executeLogCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                branchName: 'feature-strings',
+                quiet: true,
+            });
+            iReckon(lc, rootLogExplicitBranchRes.branchName).willEqual('feature-strings');
+            iReckon(lc, rootLogExplicitBranchRes.commits.length).willEqual(2);
+            iReckon(lc, rootLogExplicitBranchRes.commits[0].message).willEqual('Commit on feature');
+            iReckon(lc, rootLogExplicitBranchRes.commits[1].message).willEqual('Commit on main');
+
+            // 8. Merge feature-strings into main and verify log on main
+            process.chdir(testDir);
+            await executeMergeCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                incomingBranchName: 'feature-strings',
+            });
+
+            const mainLogAfterMergeRes = await executeLogCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, mainLogAfterMergeRes.branchName).willEqual('main');
+            iReckon(lc, mainLogAfterMergeRes.commits.length >= 2).isGonnaBeTrue();
+            iReckon(lc, mainLogAfterMergeRes.commits[0].message).willEqual('Commit on feature');
+            iReckon(lc, mainLogAfterMergeRes.commits[1].message).willEqual('Commit on main');
         } finally {
             process.chdir(origCwd);
             await fs.rm(testDir, { recursive: true, force: true });

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

@@ -37,11 +37,11 @@ export async function executeCheckoutCmd({
 }: CheckoutCmdOpts = {}): Promise<CheckoutCmdResult> {
     const lc = `${lcFile}[${executeCheckoutCmd.name}]`;
     try {
-        if (logalot) { console.log(`${lc} starting... (I: genuuid)`); }
+        if (logalot) { console.log(`${lc} starting... (I: 1cd9d2565ff16c18e82d7802ea033226)`); }
 
         const trimmedBranchName = branchName?.trim();
         if (!trimmedBranchName) {
-            throw new Error(`Branch name is required for checkout (E: genuuid)`);
+            throw new Error(`Branch name is required for checkout (E: 16edcde284b7fdfb05547c829fda5d26)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
@@ -54,7 +54,7 @@ export async function executeCheckoutCmd({
         });
 
         if (!quiet) {
-            console.log(`Switched to branch '${checkoutRes.currentBranch}' (I: genuuid)`);
+            console.log(`Switched to branch '${checkoutRes.currentBranch}' (I: f73f287d3271149058e5ee9851392726)`);
             console.log(`Worktree path: ${checkoutRes.worktreePath}`);
         }
 
@@ -64,9 +64,9 @@ export async function executeCheckoutCmd({
             worktreePath: checkoutRes.worktreePath,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 008fbfd6f9f8eb496854b4edc55ea726)`);
         throw error;
     } finally {
-        if (logalot) { console.log(`${lc} complete. (I: genuuid)`); }
+        if (logalot) { console.log(`${lc} complete. (I: d515f834dd18286f2fe1871605888c26)`); }
     }
 }

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

@@ -9,7 +9,7 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-// import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
+import { getAllBranchInfosFromIndex } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 import { openVcsRepository } from '../vcs-repo-helper.mjs';
@@ -33,6 +33,7 @@ export interface LogCmdOpts {
     targetDir?: string;
     vcsFolderName?: string;
     filePath?: string;
+    branchName?: string;
     allComments?: boolean;
     quiet?: boolean;
 }
@@ -47,6 +48,7 @@ export async function executeLogCmd({
     targetDir = process.cwd(),
     vcsFolderName = '.vcsgib',
     filePath,
+    branchName,
     allComments = false,
     quiet = false,
 }: LogCmdOpts = {}): Promise<LogCmdResult> {
@@ -54,18 +56,35 @@ export async function executeLogCmd({
 
     try {
         if (logalot) {
-            console.log(`${lc} starting executeLogCmd (I: genuuid)`);
+            console.log(`${lc} starting executeLogCmd (I: c6920dc083bff49d8b4dd148a36de826)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
         const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
         const indexIbGib = await repo.getIndexIbGib();
-        const activeBranchSpace = await repo.getActiveBranchSpace(indexIbGib);
+
+        // let resolvedBranchName = branchName;
+        // let resolvedFilePath = filePath;
+
+        // if (!resolvedBranchName && resolvedFilePath) {
+        //     const branchInfos = await getAllBranchInfosFromIndex({ indexIbGib });
+        //     if (branchInfos.some(b => b.branchName === resolvedFilePath)) {
+        //         resolvedBranchName = resolvedFilePath;
+        //         resolvedFilePath = undefined;
+        //     }
+        // }
+
+        // const activeBranchSpace = await repo.getActiveBranchSpace({
+        //     indexIbGib,
+        //     targetDir: absTargetDir,
+        //     branchName: resolvedBranchName,
+        // });
 
         const logRes = await repo.log({
-            activeBranchSpace,
             indexIbGib,
-            // repoRoot, // need this? we need jsdocs on wth repoRoot is
+            // branchName: resolvedBranchName,
+            branchName,
+            // filePath: resolvedFilePath,
             filePath,
             allComments,
             targetDir: absTargetDir,
@@ -75,7 +94,7 @@ export async function executeLogCmd({
 
         if (!quiet) {
             if (logRes.targetPath) {
-                console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: genuuid)`);
+                console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: 5b56b87941a81ed7e9036f382ca80326)`);
                 if (commits.length === 0) {
                     console.log('No comments found for this file.');
                 } else {
@@ -86,7 +105,7 @@ export async function executeLogCmd({
                     }
                 }
             } else {
-                console.log(`Branch: ${logRes.branchName} (I: genuuid)`);
+                console.log(`Branch: ${logRes.branchName} (I: da4a28fe715c302be839ad08d9f0ca26)`);
                 if (commits.length === 0) {
                     console.log('No commits yet.');
                 } else {
@@ -116,11 +135,11 @@ export async function executeLogCmd({
             commits,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: f279d589ced70f7e78050948f2191e26)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: 081e084ef158f7a608fd16a801bedf26)`);
         }
     }
 }