@ibgib/vcs-gib 0.0.47 → 0.0.51

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

@@ -6,10 +6,8 @@
  */
 
 import path from 'node:path';
-import fs from 'node:fs/promises';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-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';
@@ -61,30 +59,11 @@ export async function executeLogCmd({
 
         const absTargetDir = path.resolve(targetDir);
         const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
-        const indexIbGib = await repo.getIndexIbGib();
-
-        // 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 galaxyIbGib = await repo.getGalaxyIbGib();
 
         const logRes = await repo.log({
-            indexIbGib,
-            // branchName: resolvedBranchName,
+            galaxyIbGib,
             branchName,
-            // filePath: resolvedFilePath,
             filePath,
             allComments,
             targetDir: absTargetDir,

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

@@ -54,15 +54,15 @@ export async function executeMergeCmd({
         const { repo, vcsPath, activeWorktreeDir } =
             await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
 
-        const indexIbGib = await repo.getIndexIbGib();
-        const baseBranchName = await repo.getActiveBranchName({ indexIbGib, targetDir: absTargetDir });
+        const galaxyIbGib = await repo.getGalaxyIbGib();
+        const baseBranchName = await repo.getActiveBranchName({ galaxyIbGib, targetDir: absTargetDir });
 
         const incomingSpaceRes = await getOrCreateBranchSpace({
             metaspace: repo.metaspace,
             branchName: trimmedIncomingBranchName,
         });
 
-        const activeBranchSpace = await repo.getActiveBranchSpace({ indexIbGib, targetDir: absTargetDir });
+        const activeBranchSpace = await repo.getActiveBranchSpace({ galaxyIbGib, targetDir: absTargetDir });
         const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
 
         const mergeRes = await repo.merge({

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

@@ -2,7 +2,7 @@
  * @module reset-cmd
  *
  * CLI command handler for `vcs reset [path...]`.
- * Unstages specified files (or all files) from active branch index in localSpace.
+ * Unstages specified files (or all files) from active branch galaxy in localSpace.
  */
 
 import path from 'node:path';
@@ -43,30 +43,30 @@ export async function executeResetCmd({
     const lc = `${lcFile}[${executeResetCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: 1cd248c3453365b299a5de8aaa83cd26)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
         const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
 
-        const indexIbGib = await repo.getIndexIbGib();
-        const activeBranchSpace = await repo.getActiveBranchSpace(indexIbGib);
+        const galaxyIbGib = await repo.getGalaxyIbGib();
+        const activeBranchSpace = await repo.getActiveBranchSpace(galaxyIbGib);
 
         const skipPrompt = yes || force || quiet || !process.stdin.isTTY;
         if (!skipPrompt) {
-            const confirmed = await promptForConfirm({ msg: 'Unstage specified files from index?' });
+            const confirmed = await promptForConfirm({ msg: 'Unstage specified files from galaxy?' });
             if (!confirmed) {
                 if (!quiet) {
                     console.log('Operation cancelled.');
                 }
-                const stagedCount = Object.keys(indexIbGib.data.stagedPaths || {}).length;
+                const stagedCount = Object.keys(galaxyIbGib.data.stagedPaths || {}).length;
                 return { unstagedPaths: [], stagedCount };
             }
         }
 
         const resetRes = await repo.reset({
             activeBranchSpace,
-            indexIbGib,
+            galaxyIbGib,
             paths,
             all,
             targetDir: absTargetDir,
@@ -84,11 +84,11 @@ export async function executeResetCmd({
             stagedCount: resetRes.stagedCount,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: baac0f845bb883f4555f2d482cfca826)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: 6a21182695fd4b5e08ae518119929826)`);
         }
     }
 }

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

@@ -46,7 +46,7 @@ export async function executeRestoreCmd({
     const lc = `${lcFile}[${executeRestoreCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: f2ec77129a713122ed9ee0ff8246d826)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
@@ -77,11 +77,11 @@ export async function executeRestoreCmd({
             unstagedPaths: restoreRes.unstagedPaths,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 0b423fc29e538c25988e9ac8f3674726)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: ba5d22e40298355f44077da8823da826)`);
         }
     }
 }

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

@@ -2,7 +2,7 @@
  * @module status-cmd
  *
  * CLI command handler for `vcs status`.
- * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
+ * Compares physical workspace state against active branch snapshot tip and in-band galaxy staging area.
  */
 
 import path from 'node:path';
@@ -73,7 +73,10 @@ export async function executeStatusCmd({
                     console.log('  (use "vcs reset <file>..." to unstage)');
                     for (const item of staged) {
                         const typePrefix = item.fsType === 'folder' ? 'directory: ' : '';
-                        console.log(`\tnew file:   ${typePrefix}${item.path}`);
+                        const label = item.stagedType === 'deleted'
+                            ? 'deleted:    '
+                            : (item.stagedType === 'modified' ? 'modified:   ' : 'new file:   ');
+                        console.log(`\t${label}${typePrefix}${item.path}`);
                     }
                 }
 

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

@@ -14,7 +14,7 @@ import {
 import { extractErrorMsg, pretty } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { getDependencyGraph } from '@ibgib/core-gib/dist/common/other/graph-helper.mjs';
 import { getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { getB2tFSIndexIbGib, } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
+import { getB2tFSGalaxyIbGib, } from '@ibgib/core-gib/dist/vcs/galaxy/galaxy-helper.mjs';
 import { getOrCreateBranchSpace, parseBranchIb } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/vcs/branch/branch-types.mjs';
 import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
@@ -123,9 +123,9 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 repoPath: testDir,
                 vcsFolderName,
             });
-            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();
+            const galaxyAdd = await getB2tFSGalaxyIbGib({ space: spaceAdd, metaspace: metaspaceAdd });
+            iReckon(lc, Boolean(galaxyAdd?.data?.staged_item && galaxyAdd.data.staged_item.length > 0)).isGonnaBeTrue();
+            iReckon(lc, galaxyAdd?.rel8ns?.staged_item).isGonnaBeFalsy();
 
             const commitRes = await executeCommitCmd({
                 message: 'Initial repository commit',
@@ -138,9 +138,9 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexCommit = await getB2tFSIndexIbGib({ space: spaceCommit, metaspace: metaspaceCommit });
-            iReckon(lc, indexCommit?.data?.staged_item).willEqual([]);
-            iReckon(lc, indexCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
+            const galaxyCommit = await getB2tFSGalaxyIbGib({ space: spaceCommit, metaspace: metaspaceCommit });
+            iReckon(lc, galaxyCommit?.data?.staged_item).willEqual([]);
+            iReckon(lc, galaxyCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
 
             iReckon(lc, commitRes.branchName).willEqual('main');
             iReckon(lc, commitRes.committedPaths).includes('hello.txt');
@@ -466,11 +466,11 @@ await respecfully(lc, `vcs commit and vcs log Command Handlers`, async () => {
                 metaspace,
                 branchName: 'main',
             });
-            const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, metaspace });
-            if (!indexIbGib) { throw new Error(`(UNEXPECTED) indexIbGib falsy? (E: d4ec1b6f86cbf18808fba957b7b83826)`); }
-            const branchAddrs_spacequalified = indexIbGib.data['$@branch'] ?? [];
+            const galaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
+            if (!galaxyIbGib) { throw new Error(`(UNEXPECTED) galaxyIbGib falsy? (E: d4ec1b6f86cbf18808fba957b7b83826)`); }
+            const branchAddrs_spacequalified = galaxyIbGib.data['$@branch'] ?? [];
             if (branchAddrs_spacequalified.length === 0) {
-                throw new Error(`(UNEXPECTED) indexIbGib doesn't have any branch addrs in data? (E: 7069280124b81c6d1806fc580c704826)`);
+                throw new Error(`(UNEXPECTED) galaxyIbGib doesn't have any branch addrs in data? (E: 7069280124b81c6d1806fc580c704826)`);
             }
             const branchAddrs_spacequalified_main = branchAddrs_spacequalified
                 .filter(x => {

package/src/cli/commands/delete-files.respec.mts

@@ -0,0 +1,366 @@
+/**
+ * @module delete-files.respec
+ *
+ * Unit tests for VCS file and folder deletion workflows:
+ * - vcs add <deleted-file>
+ * - vcs add -a (auto-staging missing files as deleted)
+ * - vcs status (rendering staged & unstaged deletions)
+ * - vcs commit (Merkle DAG negative-space pruning)
+ * - vcs commit --keep-empty-folders vs --rm-empty-folders
+ * - vcs restore <deleted-file> (recovering deleted file to worktree)
+ * - vcs reset <deleted-file> (unstaging deletion)
+ */
+
+import path from 'node:path';
+import fs from 'node:fs/promises';
+
+import {
+    respecfully, ifWe, iReckon, ifWeMight,
+} from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+
+import { executeInitCmd } from './cli-init-cmd.mjs';
+import { executeAddCmd } from './cli-add-cmd.mjs';
+import { executeCommitCmd } from './cli-commit-cmd.mjs';
+import { executeStatusCmd } from './cli-status-cmd.mjs';
+import { executeResetCmd } from './cli-reset-cmd.mjs';
+import { executeRestoreCmd } from './cli-restore-cmd.mjs';
+
+const lc = `[apps/vcs-gib/src/cli/commands/delete-files.respec.mts]`;
+
+await respecfully(lc, `VCS Deletions Lifecycle Command Handlers`, async () => {
+
+    await ifWe(lc, `vcs add <deleted-file> stages deletion, and vcs commit prunes it from Merkle tree`, async () => {
+        const testDir = path.join(process.cwd(), '.test_delete_single');
+        const vcsFolderName = '.vcsgib_test_delete_single';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await fs.writeFile(path.join(testDir, 'file1.txt'), 'Content 1', 'utf8');
+
+            await executeAddCmd({
+                paths: ['file1.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await executeCommitCmd({
+                message: 'Add file1.txt',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Delete file on disk
+            await fs.unlink(path.join(testDir, 'file1.txt'));
+
+            // Status shows unstaged deletion
+            let statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.deleted.map(x => x.path)).includes('file1.txt');
+
+            // Stage deletion via vcs add <path>
+            const addRes = await executeAddCmd({
+                paths: ['file1.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, addRes.stagedPaths).includes('file1.txt');
+
+            // Status shows staged deletion
+            statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.map(x => x.path)).includes('file1.txt');
+            const stagedItem = statusRes.staged.find(x => x.path === 'file1.txt');
+            iReckon(lc, stagedItem?.stagedType).willEqual('deleted');
+
+            // Commit deletion
+            const commitRes = await executeCommitCmd({
+                message: 'Delete file1.txt',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, commitRes.committedPaths).includes('file1.txt');
+
+            // Status is clean after commit
+            statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.length).willEqual(0);
+            iReckon(lc, statusRes.deleted.length).willEqual(0);
+            iReckon(lc, statusRes.modified.length).willEqual(0);
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
+
+    await ifWe(lc, `vcs add -a stages multiple deleted files and folder pruning occurs on commit`, async () => {
+        const testDir = path.join(process.cwd(), '.test_delete_all');
+        const vcsFolderName = '.vcsgib_test_delete_all';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await fs.mkdir(path.join(testDir, 'src', 'utils'), { recursive: true });
+            await fs.writeFile(path.join(testDir, 'src', 'utils', 'math.ts'), 'export const pi = 3.14;', 'utf8');
+            await fs.writeFile(path.join(testDir, 'src', 'index.ts'), 'export * from "./utils/math.js";', 'utf8');
+            await fs.writeFile(path.join(testDir, 'readme.md'), '# Test Project', 'utf8');
+
+            await executeAddCmd({
+                all: true,
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await executeCommitCmd({
+                message: 'Initial project files',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Delete math.ts
+            await fs.unlink(path.join(testDir, 'src', 'utils', 'math.ts'));
+
+            // vcs add -a auto-stages the deleted file
+            const addRes = await executeAddCmd({
+                all: true,
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, addRes.stagedPaths).includes('src/utils/math.ts');
+
+            // Status shows staged deletion
+            let statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.map(x => x.path)).includes('src/utils/math.ts');
+
+            // Commit with default pruning (--rm-empty-folders)
+            const commitRes = await executeCommitCmd({
+                message: 'Remove math utility',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, commitRes.committedPaths).includes('src/utils/math.ts');
+
+            statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.length).willEqual(0);
+            iReckon(lc, statusRes.deleted.length).willEqual(0);
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
+
+    await ifWe(lc, `vcs commit with keepEmptyFolders retains empty folder node in tree`, async () => {
+        const testDir = path.join(process.cwd(), '.test_delete_keep_empty');
+        const vcsFolderName = '.vcsgib_test_delete_keep_empty';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await fs.mkdir(path.join(testDir, 'emptyDir'), { recursive: true });
+            await fs.writeFile(path.join(testDir, 'emptyDir', 'temp.txt'), 'temporary', 'utf8');
+
+            await executeAddCmd({
+                all: true,
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await executeCommitCmd({
+                message: 'Initial with temp.txt',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Delete temp.txt
+            await fs.unlink(path.join(testDir, 'emptyDir', 'temp.txt'));
+
+            await executeAddCmd({
+                paths: ['emptyDir/temp.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Commit with keepEmptyFolders: true
+            const commitRes = await executeCommitCmd({
+                message: 'Delete temp keeping empty dir',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+                keepEmptyFolders: true,
+            });
+            iReckon(lc, commitRes.committedPaths).includes('emptyDir/temp.txt');
+
+            const statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.length).willEqual(0);
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
+
+    await ifWe(lc, `vcs restore <file> restores deleted file from committed snapshot to disk`, async () => {
+        const testDir = path.join(process.cwd(), '.test_restore_deleted');
+        const vcsFolderName = '.vcsgib_test_restore_deleted';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await fs.mkdir(path.join(testDir, 'assets', 'css'), { recursive: true });
+            await fs.writeFile(path.join(testDir, 'assets', 'css', 'style.css'), 'body { margin: 0; }', 'utf8');
+
+            await executeAddCmd({
+                all: true,
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await executeCommitCmd({
+                message: 'Add stylesheet',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Delete style.css from disk
+            await fs.unlink(path.join(testDir, 'assets', 'css', 'style.css'));
+
+            let statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.deleted.map(x => x.path)).includes('assets/css/style.css');
+
+            // Restore deleted file from committed snapshot
+            const restoreRes = await executeRestoreCmd({
+                paths: ['assets/css/style.css'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, restoreRes.restoredPaths).includes('assets/css/style.css');
+
+            // Verify file is back on disk at correct nested path with correct content
+            const restoredContent = await fs.readFile(path.join(testDir, 'assets', 'css', 'style.css'), 'utf8');
+            iReckon(lc, restoredContent).willEqual('body { margin: 0; }');
+
+            statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.deleted.length).willEqual(0);
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
+
+    await ifWe(lc, `vcs reset <file> unstages a staged deletion`, async () => {
+        const testDir = path.join(process.cwd(), '.test_reset_deletion');
+        const vcsFolderName = '.vcsgib_test_reset_deletion';
+        try {
+            await executeInitCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await fs.writeFile(path.join(testDir, 'important.txt'), 'Important data', 'utf8');
+
+            await executeAddCmd({
+                paths: ['important.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            await executeCommitCmd({
+                message: 'Add important file',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            // Delete from disk
+            await fs.unlink(path.join(testDir, 'important.txt'));
+
+            // Stage deletion
+            await executeAddCmd({
+                paths: ['important.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+
+            let statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, statusRes.staged.map(x => x.path)).includes('important.txt');
+
+            // Reset (unstage) deletion
+            const resetRes = await executeResetCmd({
+                paths: ['important.txt'],
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            iReckon(lc, resetRes.unstagedPaths).includes('important.txt');
+
+            statusRes = await executeStatusCmd({
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            // Should no longer be staged, but still unstaged deleted
+            iReckon(lc, statusRes.staged.length).willEqual(0);
+            iReckon(lc, statusRes.deleted.map(x => x.path)).includes('important.txt');
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
+
+});

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

@@ -18,7 +18,7 @@ const lc = `[apps/vcs-gib/src/cli/commands/init-cmd.respec.mts]`;
 
 await respecfully(lc, `vcs init Command Handler`, async () => {
 
-    await ifWe(lc, `initializes repository space, branch, and index in target folder`, async () => {
+    await ifWe(lc, `initializes repository space, branch, and galaxy in target folder`, async () => {
         const testDir = path.join(process.cwd(), '.test_init_repo');
         const vcsFolderName = '.vcsgib_init_test';
         try {

package/src/cli/commands/reset-restore-cmd.respec.mts

@@ -22,7 +22,7 @@ const lc = `[apps/vcs-gib/src/cli/commands/reset-restore-cmd.respec.mts]`;
 
 await respecfully(lc, `vcs reset and vcs restore Command Handlers`, async () => {
 
-    await ifWe(lc, `vcs reset clears staged file from index while keeping disk file edits intact`, async () => {
+    await ifWe(lc, `vcs reset clears staged file from galaxy while keeping disk file edits intact`, async () => {
         const testDir = path.join(process.cwd(), '.test_reset_1');
         const vcsFolderName = '.vcsgib_test_reset_1';
         try {
@@ -79,7 +79,7 @@ await respecfully(lc, `vcs reset and vcs restore Command Handlers`, async () =>
         }
     });
 
-    await ifWe(lc, `vcs restore --staged unstages file from index while keeping disk edits intact`, async () => {
+    await ifWe(lc, `vcs restore --staged unstages file from galaxy while keeping disk edits intact`, async () => {
         const testDir = path.join(process.cwd(), '.test_restore_staged');
         const vcsFolderName = '.vcsgib_test_restore_staged';
         try {
@@ -172,7 +172,7 @@ await respecfully(lc, `vcs reset and vcs restore Command Handlers`, async () =>
         }
     });
 
-    await ifWe(lc, `vcs reset --all unstages all files from index`, async () => {
+    await ifWe(lc, `vcs reset --all unstages all files from galaxy`, async () => {
         const testDir = path.join(process.cwd(), '.test_reset_all');
         const vcsFolderName = '.vcsgib_test_reset_all';
         try {

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

@@ -12,7 +12,7 @@ import {
 } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { getB2tFSIndexIbGib } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
+import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/vcs/galaxy/galaxy-helper.mjs';
 
 import { executeInitCmd } from './cli-init-cmd.mjs';
 import { executeStatusCmd } from './cli-status-cmd.mjs';
@@ -144,9 +144,9 @@ await respecfully(lc, `vcs status and vcs add Command Handlers`, async () => {
                 repoPath: testDir,
                 vcsFolderName,
             });
-            const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, metaspace });
-            iReckon(lc, Boolean(indexIbGib?.data?.staged_item && indexIbGib.data.staged_item.length > 0)).isGonnaBeTrue();
-            iReckon(lc, indexIbGib?.rel8ns?.staged_item).isGonnaBeFalsy();
+            const galaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
+            iReckon(lc, Boolean(galaxyIbGib?.data?.staged_item && galaxyIbGib.data.staged_item.length > 0)).isGonnaBeTrue();
+            iReckon(lc, galaxyIbGib?.rel8ns?.staged_item).isGonnaBeFalsy();
 
             const statusRes = await executeStatusCmd({
                 targetDir: testDir,