@ibgib/vcs-gib 0.0.49 → 0.0.52

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

@@ -2,13 +2,13 @@
  * @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';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-types.mjs';
+import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/cosmology/branching/status/status-types.mjs';
 import { openVcsRepository } from '../vcs-repo-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 

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

@@ -14,10 +14,10 @@ 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 { 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';
+import { getB2tFSGalaxyIbGib, } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.mjs';
+import { getOrCreateBranchSpace, parseBranchIb } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
+import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-types.mjs';
+import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
 import { getIbGibFromSpace, parseSpaceQualifiedIbGibAddr } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
 
 import { executeInitCmd } from './cli-init-cmd.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/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/cosmology/branching/repo/b2tfs-repo-helpers.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,

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

@@ -48,7 +48,7 @@ Commands:
   branch [name]         List or create branches
   checkout <branch>     Switch to a specified branch and project worktree
   merge <branch>        Merge specified branch into active branch
-  reset [path...]       Unstage specified files from index (-a, --all for all)
+  reset [path...]       Unstage specified files from galaxy (-a, --all for all)
   restore [path...]     Restore working tree files or unstage (--staged)
 
 Flags:
@@ -58,7 +58,7 @@ Flags:
   -b <branch>           Target branch name
   -c, --comments        Show full comment content in status
   -a, --all             Stage all tracked/untracked files (for add/reset)
-  -s, --staged          Unstage specified files from index (for restore)
+  -s, --staged          Unstage specified files from galaxy (for restore)
   -w, --worktree        Revert physical working tree files (for restore)
   -y, --yes             Automatically confirm interactive prompts
   -f, --force           Force operation execution
@@ -76,7 +76,7 @@ export async function main({
     const lc = `${lcFile}[${main.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: 600b85201b637bb3581aa4eff3c37826)`);
         }
 
         const parsed = parseVcsArgs(argv);
@@ -198,7 +198,7 @@ export async function main({
             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')) {
+        } else if (cleanMsg.toLowerCase().includes('not found in galaxyIbgib') || 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}`);
@@ -208,7 +208,7 @@ export async function main({
         return 1;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: d68908b0f736b838ef4ac3b8d266d826)`);
         }
     }
 }

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

@@ -5,18 +5,17 @@
  */
 
 import path from 'node:path';
-import fs from 'node:fs/promises';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.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';
+import { VcsRepository, WorkspaceProjectionSpaceFactory } from '@ibgib/core-gib/dist/cosmology/branching/branching-facade.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
+import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
+import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-constants.mjs';
 import { getOrCreateWorkspaceProjectionSpace } from '@ibgib/node-gib/dist/vcs/workspace-space-helper.mjs';
 
 import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
 import { bootstrapVcsMetaspace } from '../bootstrap/node-bootstrap.mjs';
-import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/vcs/branch/branch-constants.mjs';
 
 const logalot = GLOBAL_LOG_A_LOT;
 
@@ -55,17 +54,17 @@ export async function openVcsRepository({
             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(`fatal: not an ibgib repository (index not found in ${vcsPath})`);
+        // 2. Fetch authoritative in-band galaxy from localSpace
+        const galaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
+        if (!galaxyIbGib) {
+            throw new Error(`fatal: not an ibgib repository (galaxy not found in ${vcsPath}) (E: 615a88627ba8daf8cbb9684bbd8d3826)`);
         }
 
         // 3. Determine active branch and worktree directory
         const activeBranchName = branchName || resolveContextualBranchName({
             targetDir: absTargetDir,
             repoRoot,
-            indexIbGib,
+            galaxyIbGib,
         });
 
         const activeWorktreeDir = activeBranchName === B2TFS_BRANCH_DEFAULT_NAME

package/src/engine/branch/branch-space.respec.mts

@@ -14,10 +14,10 @@ import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { getFromSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { getB2tFSItemIb } from '@ibgib/core-gib/dist/vcs/item/item-atom-helper.mjs';
-import { populateBranchSpaceFromGraph } from '@ibgib/core-gib/dist/vcs/branch/branch-graph-helper.mjs';
-import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
-import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
+import { getB2tFSItemIb } from '@ibgib/core-gib/dist/cosmology/branching/item/item-atom-helpers.mjs';
+import { populateBranchSpaceFromGraph } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-graph-helpers.mjs';
+import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
 import { getSpaceQualifiedIbGibAddr, parseSpaceQualifiedIbGibAddr, isSpaceQualifiedAddr } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';

package/src/engine/merge/b2tfs-sync-comments.respec.mts

@@ -25,10 +25,10 @@ import { createCommentIbGib } from '@ibgib/core-gib/dist/common/comment/comment-
 import { getBinIb } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
 import { BinIbGib_V1 } from '@ibgib/core-gib/dist/common/bin/bin-types.mjs';
 import { putInSpace, persistTransformResult, registerNewIbGib, getFromSpace, getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '@ibgib/core-gib/dist/vcs/item/item-helper.mjs';
-import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
-import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/vcs/merge/b2tfs-3way-graft-strategy.mjs';
-import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
+import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '@ibgib/core-gib/dist/cosmology/branching/item/item-helpers.mjs';
+import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
+import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/cosmology/branching/merge/b2tfs-3way-graft-strategy.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 

package/src/test/test-helpers.mts

@@ -20,8 +20,8 @@ import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
 import { getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
 import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
 
-import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/vcs/branch/branch-types.mjs';
-import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
+import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-types.mjs';
+import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
 import { getIbGibFromSpace } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
 
 

package/src/vcs-gib.respec.mts

@@ -2,7 +2,7 @@
  * @module vcs-gib.respec.node
  *
  * Full Engine Cycle Integration Tests for @ibgib/vcs-gib.
- * Tests Metaspace bootstrap, canonical ib atoms, item creation, branch spaces, and index tracking.
+ * Tests Metaspace bootstrap, canonical ib atoms, item creation, branch spaces, and galaxy tracking.
  */
 
 import path from 'node:path';
@@ -12,10 +12,10 @@ import { respecfully, ifWe, iReckon } from '@ibgib/helper-gib/dist/respec-gib/re
 import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { getB2tFSItemIb } from '@ibgib/core-gib/dist/vcs/item/item-atom-helper.mjs';
-import { createB2tFSBranchIbGib, getB2tFSBranchSpaceName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
-import { createB2tFSIndexIbGib, } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
-import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
+import { getB2tFSItemIb } from '@ibgib/core-gib/dist/cosmology/branching/item/item-atom-helpers.mjs';
+import { createB2tFSBranchIbGib, getB2tFSBranchSpaceName } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
+import { createB2tFSGalaxyIbGib, } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.mjs';
+import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
 import { getSpaceQualifiedIbGibAddr, parseSpaceQualifiedIbGibAddr } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
 import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
 
@@ -43,8 +43,8 @@ await respecfully(lc, `vcs-gib Full Engine Cycle`, async () => {
         });
     });
 
-    await respecfully(lc, `Branch Spaces & Index Tracking`, async () => {
-        await ifWe(lc, `initializes metaspace, creates branch, and registers index`, async () => {
+    await respecfully(lc, `Branch Spaces & Galaxy Tracking`, async () => {
+        await ifWe(lc, `initializes metaspace, creates branch, and registers galaxy`, async () => {
             const testDir = path.join(process.cwd(), '.test_cycle_repo');
             try {
                 const { metaspace, localSpace } = await bootstrapVcsMetaspace({
@@ -86,17 +86,17 @@ await respecfully(lc, `vcs-gib Full Engine Cycle`, async () => {
                     spaceId: localSpaceId,
                 });
 
-                // Create Index IbGib
-                const indexIbGib = await createB2tFSIndexIbGib({
+                // Create Galaxy IbGib
+                const galaxyIbGib = await createB2tFSGalaxyIbGib({
                     activeSpaceId: localSpaceId,
                     space: localSpace,
                     activeBranchName: branchName,
                     sqBranchAddr,
                     metaspace,
                 });
-                iReckon(lc, indexIbGib.data?.mySpaceId).willEqual(localSpaceId);
-                iReckon(lc, indexIbGib.data?.staged_item).willEqual([]);
-                iReckon(lc, indexIbGib.rel8ns?.staged_item).isGonnaBeFalsy();
+                iReckon(lc, galaxyIbGib.data?.mySpaceId).willEqual(localSpaceId);
+                iReckon(lc, galaxyIbGib.data?.staged_item).willEqual([]);
+                iReckon(lc, galaxyIbGib.rel8ns?.staged_item).isGonnaBeFalsy();
             } finally {
                 await fs.rm(testDir, { recursive: true, force: true });
             }