@ibgib/vcs-gib 0.0.33 → 0.0.36

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

@@ -14,6 +14,7 @@ import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/vcs/branch/branc
 
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
+import { getB2tFSIndexIbGib } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
 import { writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 
 const lcFile = `[init-cmd]`;
@@ -46,12 +47,27 @@ export async function executeInitCmd({
     await fs.mkdir(absTargetDir, { recursive: true });
 
     // 2. Bootstrap Metaspace and localSpace (creates .vcsgib on disk)
-    const { metaspace, localSpace } = await bootstrapVcsMetaspace({
+    const { metaspace, localSpace, foundVcsPath } = await bootstrapVcsMetaspace({
         repoPath: absTargetDir,
         vcsFolderName,
         defaultSpaceName: `vcs_${path.basename(absTargetDir).replace(/[^a-zA-Z0-9_\-]/g, '_')}`,
     });
 
+    if (foundVcsPath) {
+        const existingIndex = await getB2tFSIndexIbGib({ space: localSpace, metaspace });
+        if (existingIndex) {
+            if (!quiet) {
+                console.log(`Reinitialized existing ibgib repository in ${vcsPath}`);
+            }
+            return {
+                vcsPath,
+                spaceId: existingIndex.data.activeSpaceId,
+                branchName: existingIndex.data.activeBranchName || defaultBranchName,
+                rootItemIb: '',
+            };
+        }
+    }
+
     // 3. Facade instantiation and domain init
     const repo = new VcsRepository({
         metaspace,

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

@@ -30,7 +30,6 @@ import { executeCheckoutCmd } from './cli-checkout-cmd.mjs';
 import { executeMergeCmd } from './cli-merge-cmd.mjs';
 import { executeGenerateCommentCmd } from './cli-generate-comment-cmd.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
 
 const lc = `[apps/vcs-gib/src/cli/commands/commit-log-cmd.respec.mts]`;
 
@@ -120,11 +119,11 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 quiet: true,
             });
 
-            const { localSpace: spaceAdd, vcsPath: vcsPathAdd } = await bootstrapVcsMetaspace({
+            const { metaspace: metaspaceAdd, localSpace: spaceAdd } = await bootstrapVcsMetaspace({
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexAdd = await readVcsIndexProjectionFromDisk({ space: spaceAdd, vcsPath: vcsPathAdd });
+            const indexAdd = await getB2tFSIndexIbGib({ space: spaceAdd, metaspace: metaspaceAdd });
             iReckon(lc, Boolean(indexAdd?.data?.staged_item && indexAdd.data.staged_item.length > 0)).isGonnaBeTrue();
             iReckon(lc, indexAdd?.rel8ns?.staged_item).isGonnaBeFalsy();
 
@@ -135,11 +134,11 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 quiet: true,
             });
 
-            const { localSpace: spaceCommit, vcsPath: vcsPathCommit } = await bootstrapVcsMetaspace({
+            const { metaspace: metaspaceCommit, localSpace: spaceCommit } = await bootstrapVcsMetaspace({
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexCommit = await readVcsIndexProjectionFromDisk({ space: spaceCommit, vcsPath: vcsPathCommit });
+            const indexCommit = await getB2tFSIndexIbGib({ space: spaceCommit, metaspace: metaspaceCommit });
             iReckon(lc, indexCommit?.data?.staged_item).willEqual([]);
             iReckon(lc, indexCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
 
@@ -455,7 +454,6 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
 
             const allMessages = mergedFileLog.commits.map(c => c.message).join(' -- ');
             console.log(`allMessages: ${pretty(allMessages)}`);
-            iReckon(lc, allMessages).includes(`\n\n${pretty(allMessages)}\n\n`);
             iReckon(lc, allMessages).includes('updated b to 200');
             iReckon(lc, allMessages).includes('updated a to 100');
 
@@ -468,8 +466,7 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 metaspace,
                 branchName: 'main',
             });
-            const indexIbGib = (await getB2tFSIndexIbGib({ space: localSpace, metaspace }))
-                || (await readVcsIndexProjectionFromDisk({ space: localSpace, vcsPath }));
+            const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, metaspace });
             if (!indexIbGib) { throw new Error(`(UNEXPECTED) indexIbGib falsy? (E: d4ec1b6f86cbf18808fba957b7b83826)`); }
             const branchAddrs_spacequalified = indexIbGib.data['$@branch'] ?? [];
             if (branchAddrs_spacequalified.length === 0) {

package/src/cli/commands/status-add-cmd.respec.mts

@@ -24,7 +24,7 @@ const lc = `[apps/vcs-gib/src/cli/commands/status-add-cmd.respec.mts]`;
 
 await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
 
-    await ifWeMight(lc, `detects untracked files in fresh repository`, async () => {
+    await ifWe(lc, `detects untracked files in fresh repository`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_1');
         const vcsFolderName = '.vcsgib_test_1';
         try {
@@ -50,7 +50,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `discovers .vcsgib via upward discovery when executed from a subfolder`, async () => {
+    await ifWe(lc, `discovers .vcsgib via upward discovery when executed from a subfolder`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_subfolder');
         const vcsFolderName = '.vcsgib_test_subfolder';
         try {
@@ -77,7 +77,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `skips re-staging unmodified committed files during executeAddCmd with all flag`, async () => {
+    await ifWe(lc, `skips re-staging unmodified committed files during executeAddCmd with all flag`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_unmodified');
         const vcsFolderName = '.vcsgib_test_unmodified';
         try {
@@ -118,7 +118,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `stages untracked file via executeAddCmd`, async () => {
+    await ifWe(lc, `stages untracked file via executeAddCmd`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_2');
         const vcsFolderName = '.vcsgib_test_2';
         try {
@@ -162,7 +162,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `respects .ibgibignore patterns during status and add`, async () => {
+    await ifWe(lc, `respects .ibgibignore patterns during status and add`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_3');
         const vcsFolderName = '.vcsgib_test_3';
         try {
@@ -203,7 +203,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `stages files matching glob pattern with executeAddCmd`, async () => {
+    await ifWe(lc, `stages files matching glob pattern with executeAddCmd`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_glob');
         const vcsFolderName = '.vcsgib_test_glob';
         try {
@@ -246,7 +246,7 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
         }
     });
 
-    await ifWeMight(lc, `stages relative file paths correctly when targetDir is a subdirectory`, async () => {
+    await ifWe(lc, `stages relative file paths correctly when targetDir is a subdirectory`, async () => {
         const testDir = path.join(process.cwd(), '.test_status_add_subdir');
         const vcsFolderName = '.vcsgib_test_subdir';
         try {

package/src/cli/vcs-cli-main.mts

@@ -183,7 +183,25 @@ export async function main({
 
         return 0;
     } catch (error) {
-        console.error(`Error: ${extractErrorMsg(error)} (E: genuuid)`);
+        let rawMsg = extractErrorMsg(error);
+        // Strip trailing internal UUID / error markers like (E: ...)
+        const cleanMsg = rawMsg.replace(/\s*\(E:\s*[a-f0-9-]+\)\s*$/i, '').trim();
+
+        if (cleanMsg.startsWith('fatal:') || cleanMsg.startsWith('error:')) {
+            console.error(cleanMsg);
+        } else if (cleanMsg.toLowerCase().includes('nothing to commit')) {
+            console.error('nothing to commit, working tree clean');
+        } else if (cleanMsg.toLowerCase().includes('already exists')) {
+            const branchMatch = cleanMsg.match(/["']([^"']+)["']/);
+            const name = branchMatch ? branchMatch[1] : '';
+            console.error(name ? `fatal: a branch named '${name}' already exists.` : `fatal: ${cleanMsg}`);
+        } else if (cleanMsg.toLowerCase().includes('not found in indexibgib') || cleanMsg.toLowerCase().includes('not found on branch')) {
+            const branchMatch = cleanMsg.match(/\(([^)]+)\)/) || cleanMsg.match(/['"]([^'"]+)['"]/);
+            const name = branchMatch ? branchMatch[1] : '';
+            console.error(name ? `error: pathspec '${name}' did not match any file(s) known to ibgib` : `error: ${cleanMsg}`);
+        } else {
+            console.error(`fatal: ${cleanMsg}`);
+        }
         return 1;
     } finally {
         if (logalot) {

package/src/cli/vcs-repo-helper.mts

@@ -8,7 +8,7 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { VcsRepository } from '@ibgib/core-gib/dist/vcs/vcs-repository.mjs';
+import { VcsRepository, WorkspaceProjectionSpaceFactory } from '@ibgib/core-gib/dist/vcs/vcs-repository.mjs';
 import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 import { getB2tFSIndexIbGib } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
 import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
@@ -45,15 +45,20 @@ export async function openVcsRepository({
         const absTargetDir = path.resolve(targetDir);
 
         // 1. Locate repository root and bootstrap Node localSpace
-        const { metaspace, localSpace, vcsPath, repoRoot } = await bootstrapVcsMetaspace({
+        const { metaspace, localSpace, vcsPath, repoRoot, foundVcsPath } = await bootstrapVcsMetaspace({
             repoPath: absTargetDir,
             vcsFolderName,
+            mustExist: true,
         });
 
+        if (!foundVcsPath) {
+            throw new Error(`fatal: not an ibgib repository (or any of the parent directories): ${vcsFolderName}`);
+        }
+
         // 2. Fetch authoritative in-band index from localSpace
         const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, metaspace });
         if (!indexIbGib) {
-            throw new Error(`Not an ibgib repository (index not found in ${vcsPath})`);
+            throw new Error(`fatal: not an ibgib repository (index not found in ${vcsPath})`);
         }
 
         // 3. Determine active branch and worktree directory
@@ -80,11 +85,25 @@ export async function openVcsRepository({
             backingSpace: activeSpace,
         });
 
+        const fnGetWorkspaceProjectionSpace: WorkspaceProjectionSpaceFactory = async ({
+            worktreeDir,
+            backingSpace,
+        }) => {
+            const { space } = await getOrCreateWorkspaceProjectionSpace({
+                metaspace,
+                workspaceRoot: worktreeDir,
+                vcsFolderName,
+                backingSpace,
+            });
+            return space;
+        };
+
         // 5. Construct domain facade
         const repo = new VcsRepository({
             metaspace,
             localSpace,
             workspaceSpace,
+            fnGetWorkspaceProjectionSpace,
             repoRoot,
             vcsFolderName,
         });