@ibgib/vcs-gib 0.0.30 → 0.0.32

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

@@ -1,7 +1,7 @@
 /**
  * @module status-cmd
  * 
- * Command handler for `vcs status`.
+ * CLI command handler for `vcs status`.
  * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
  */
 
@@ -9,9 +9,15 @@ import path from 'node:path';
 import fs from 'node:fs/promises';
 
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { executeVcsStatus } from '@ibgib/core-gib/dist/vcs/commands/status-cmd.mjs';
+import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-helper.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
+
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { getOrCreateWorkspaceProjectionSpace } from '@ibgib/node-gib/dist/vcs/workspace-space-helper.mjs';
+import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { getRepoStatus, VcsStatusItem, PendingCommentInfo } from '../../engine/status/status-helper.mjs';
 
 const lcFile = `[status-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
@@ -61,16 +67,35 @@ export async function executeStatusCmd({
             throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 4d5e6f7a8b9c10d11e12f13a14b15c6d)`);
         }
 
-        const statusRes = await getRepoStatus({
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
+        const branchName = resolveContextualBranchName({ targetDir: absTargetDir, repoRoot, indexIbGib });
+        const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
+
+        const { space: activeBranchSpace } = await getOrCreateBranchSpace({
             metaspace,
-            localSpace,
             vcsPath,
+            branchName,
+        });
+
+        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
+            metaspace,
+            workspaceRoot: activeWorktreeDir,
+            vcsFolderName,
+            backingSpace: activeBranchSpace,
+        });
+
+        const statusRes = await executeVcsStatus({
+            metaspace,
+            localSpace,
+            activeBranchSpace,
+            workspaceSpace,
+            indexIbGib,
             repoRoot,
             targetDir: absTargetDir,
             vcsFolderName,
         });
 
-        const { branchName, staged, modified, deleted, untracked, pendingComments } = statusRes;
+        const { staged, modified, deleted, untracked, pendingComments } = statusRes;
 
         const commentsByTarget = new Map<string, PendingCommentInfo[]>();
         for (const c of pendingComments) {
@@ -80,77 +105,57 @@ export async function executeStatusCmd({
         }
 
         if (!quiet) {
-            console.log(`On branch ${branchName} (I: 9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b)`);
-
-            if (staged.length > 0) {
-                console.log('\nChanges to be committed:');
-                for (const item of staged) {
-                    const itemComments = commentsByTarget.get(item.path) || [];
-                    console.log(`  staged:   ${item.path}`);
-                    if (itemComments.length === 0) {
-                        console.log(`    (hint: no comment file found for ${item.path} - run 'vcs gmsg')`);
-                    } else if (comments) {
-                        for (const comm of itemComments) {
-                            console.log(`    [comment: ${comm.commentRelPath}]`);
-                            const lines = comm.content.trim().split('\n');
-                            for (const line of lines) {
-                                console.log(`      ${line}`);
-                            }
-                        }
+            console.log(`On branch ${statusRes.branchName} (I: 5e6f7a8b9c10d11e12f13a14b15c16d1)`);
+
+            if (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0 && pendingComments.length === 0) {
+                console.log('nothing to commit, working tree clean');
+            } else {
+                if (staged.length > 0) {
+                    console.log('\nChanges to be committed:');
+                    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}`);
                     }
                 }
-            }
 
-            if (modified.length > 0 || deleted.length > 0) {
-                console.log('\nChanges not staged for commit:');
-                for (const item of modified) {
-                    const itemComments = commentsByTarget.get(item.path) || [];
-                    console.log(`  modified: ${item.path}`);
-                    if (comments && itemComments.length > 0) {
-                        for (const comm of itemComments) {
-                            console.log(`    [comment: ${comm.commentRelPath}]`);
-                            const lines = comm.content.trim().split('\n');
-                            for (const line of lines) {
-                                console.log(`      ${line}`);
-                            }
-                        }
+                if (modified.length > 0 || deleted.length > 0) {
+                    console.log('\nChanges not staged for commit:');
+                    console.log('  (use "vcs add <file>..." to update what will be committed)');
+                    console.log('  (use "vcs restore <file>..." to discard changes in working directory)');
+                    for (const item of modified) {
+                        console.log(`\tmodified:   ${item.path}`);
+                    }
+                    for (const item of deleted) {
+                        console.log(`\tdeleted:    ${item.path}`);
                     }
                 }
-                for (const item of deleted) {
-                    console.log(`  deleted:  ${item.path}`);
-                }
-            }
 
-            if (untracked.length > 0) {
-                console.log('\nUntracked files:');
-                for (const item of untracked) {
-                    console.log(`  untracked:${item.path}`);
+                if (untracked.length > 0) {
+                    console.log('\nUntracked files:');
+                    console.log('  (use "vcs add <file>..." to include in what will be committed)');
+                    for (const item of untracked) {
+                        const suffix = item.fsType === 'folder' ? '/' : '';
+                        console.log(`\t${item.path}${suffix}`);
+                    }
                 }
-            }
 
-            // Pending folder-level comments
-            const folderComments = pendingComments.filter(c => c.targetType === 'folder');
-            if (folderComments.length > 0) {
-                console.log('\nPending folder comments:');
-                for (const fc of folderComments) {
-                    const folderLabel = fc.targetRelPath ? fc.targetRelPath : '(root)';
-                    console.log(`  folder: ${folderLabel} [${fc.commentRelPath}]`);
-                    if (comments) {
-                        const lines = fc.content.trim().split('\n');
-                        for (const line of lines) {
-                            console.log(`      ${line}`);
+                if (pendingComments.length > 0) {
+                    console.log('\nPending companion comments:');
+                    console.log('  (will be attached to items upon "vcs commit")');
+                    for (const comment of pendingComments) {
+                        const targetLabel = comment.targetRelPath ? comment.targetRelPath : '(root)';
+                        console.log(`\tcomment on [${targetLabel}]: ${comment.commentRelPath}`);
+                        if (comments) {
+                            console.log(`\t  Preview: ${comment.content.slice(0, 80).replace(/\n/g, ' ')}...`);
                         }
                     }
                 }
             }
-
-            if (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0) {
-                console.log('nothing to commit, working tree clean');
-            }
         }
 
         return {
-            branchName,
+            branchName: statusRes.branchName,
             staged,
             modified,
             deleted,
@@ -158,11 +163,11 @@ export async function executeStatusCmd({
             pendingComments,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 5e6f7a8b9c10d11e12f13a14b15c6d7e)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 6f7a8b9c10d11e12f13a14b15c16d17e)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: 6f7a8b9c10d11e12f13a14b15c6d7e8f)`);
+            console.log(`${lc} complete. (I: 8a9b10c11d12e13f14a15b16c17d18e1)`);
         }
     }
 }

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

@@ -0,0 +1,112 @@
+/**
+ * @module vcs-projection-helper
+ * 
+ * CLI-specific filesystem projection helpers for reading and writing `.vcsgib/vcs_index_projection.json`.
+ * Strictly housed in `apps/vcs-gib` CLI layer to maintain pure isolation from `core-gib`.
+ */
+
+import path from 'node:path';
+import fs from 'node:fs/promises';
+
+import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
+import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
+import { getIbGibsFromCache_fallbackToSpaces } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
+import { B2tFSIndexIbGib_V1 } from '@ibgib/core-gib/dist/vcs/index/index-types.mjs';
+import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
+
+const lcFile = `[vcs-projection-helper]`;
+const logalot = GLOBAL_LOG_A_LOT;
+
+/**
+ * Retrieves authoritative B2tFSIndexIbGib_V1 from space by reading the `.vcsgib/vcs_index_projection.json` pointer on disk.
+ */
+export async function readVcsIndexProjectionFromDisk({
+    vcsPath,
+    space,
+}: {
+    vcsPath: string;
+    space: IbGibSpaceAny;
+}): Promise<B2tFSIndexIbGib_V1 | undefined> {
+    const lc = `${lcFile}[${readVcsIndexProjectionFromDisk.name}]`;
+    try {
+        if (logalot) {
+            console.log(`${lc} starting... (I: 7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b)`);
+        }
+
+        if (!vcsPath) {
+            return undefined;
+        }
+
+        const projPath = path.join(vcsPath, 'vcs_index_projection.json');
+        let indexAddr: string | undefined;
+        try {
+            const raw = await fs.readFile(projPath, 'utf8');
+            const parsed = JSON.parse(raw);
+            indexAddr = parsed.indexAddr;
+        } catch {
+            return undefined;
+        }
+
+        if (!indexAddr) {
+            return undefined;
+        }
+
+        const ibgibs = await getIbGibsFromCache_fallbackToSpaces({
+            addrs: [indexAddr],
+            space,
+        });
+
+        const indexIbGib = ibgibs?.at(0) as B2tFSIndexIbGib_V1;
+        return indexIbGib;
+    } catch (error) {
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c)`);
+        throw error;
+    } finally {
+        if (logalot) {
+            console.log(`${lc} complete. (I: 9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d)`);
+        }
+    }
+}
+
+/**
+ * Writes read-only JSON projection cache of repository index to disk.
+ */
+export async function writeVcsIndexProjectionToDisk({
+    vcsPath,
+    indexIbGib,
+}: {
+    vcsPath: string;
+    indexIbGib: B2tFSIndexIbGib_V1;
+}): Promise<void> {
+    const lc = `${lcFile}[${writeVcsIndexProjectionToDisk.name}]`;
+    try {
+        if (logalot) {
+            console.log(`${lc} starting... (I: 3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b)`);
+        }
+
+        await fs.mkdir(vcsPath, { recursive: true });
+
+        const indexAddr = getIbGibAddr({ ibGib: indexIbGib });
+        const projectionObj = {
+            _isReadOnlyProjection: true,
+            _comment: 'STRICTLY READ-ONLY PROJECTION GENERATED FROM B2TFSINDEXIBGIB_V1 IN LOCALSPACE',
+            indexAddr,
+            spaceId: indexIbGib.data?.mySpaceId,
+            activeBranch: indexIbGib.data?.activeBranch || 'main',
+            stagedCount: (indexIbGib.data?.staged_item || []).length,
+            stagedPaths: indexIbGib.data?.stagedPaths || {},
+            updatedAt: new Date().toISOString(),
+        };
+
+        const projFile = path.join(vcsPath, 'vcs_index_projection.json');
+        await fs.writeFile(projFile, JSON.stringify(projectionObj, null, 2), 'utf8');
+    } catch (error) {
+        console.error(`${lc} ${extractErrorMsg(error)} (E: 4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c)`);
+        throw error;
+    } finally {
+        if (logalot) {
+            console.log(`${lc} complete. (I: 5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d)`);
+        }
+    }
+}

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

@@ -17,11 +17,11 @@ import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
 import { getFromSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getB2tFSItemIb } from '../item/item-atom-helper.mjs';
-import { getOrCreateBranchSpace } from './branch-space-helper.mjs';
-import { populateBranchSpaceFromGraph } from './branch-graph-helper.mjs';
-import { getSpaceQualifiedIbGibAddr, parseSpaceQualifiedIbGibAddr } from '../index/index-helper.mjs';
-import { B2tFSItemIbGib_V1 } from '../item/item-types.mjs';
+import { getB2tFSItemIb } from '@ibgib/core-gib/dist/vcs/item/item-atom-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { populateBranchSpaceFromGraph } from '@ibgib/core-gib/dist/vcs/branch/branch-graph-helper.mjs';
+import { getSpaceQualifiedIbGibAddr, parseSpaceQualifiedIbGibAddr } from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
+import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
 
 const lc = `[apps/vcs-gib/src/engine/branch/branch-space.respec.node.mts]`;
 

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

@@ -27,10 +27,10 @@ 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 { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '../branch/branch-space-helper.mjs';
-import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../item/item-helper.mjs';
-import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME } from '../item/item-types.mjs';
-import { B2tFS3WayGraftStrategy } from './b2tfs-3way-graft-strategy.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-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';
 
 const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-sync-comments.respec.node.mts]`;
 const graftStrategySvc = GraftStrategyService.instance;

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 '../engine/branch/branch-types.mjs';
-import { B2tFSItemIbGib_V1 } from '../engine/item/item-types.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';
 
 
 // ─────────────────────────────────────────────────────────────────────────────

package/src/vcs-gib.respec.mts

@@ -1,6 +1,6 @@
 /**
  * @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.
  */
@@ -8,17 +8,20 @@
 import path from 'node:path';
 import fs from 'node:fs/promises';
 
-import {
-    respecfully, ifWe, iReckon
-} from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
+import { respecfully, ifWe, iReckon } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.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, getSpaceQualifiedIbGibAddr,
+    parseSpaceQualifiedIbGibAddr
+} from '@ibgib/core-gib/dist/vcs/index/index-helper.mjs';
+import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
 
 import { bootstrapVcsMetaspace } from './bootstrap/node-bootstrap.mjs';
-import { getB2tFSItemIb } from './engine/item/item-atom-helper.mjs';
-import { createB2tFSBranchIbGib, getB2tFSBranchSpaceName } from './engine/branch/branch-helper.mjs';
-import { createB2tFSIndexIbGib, getSpaceQualifiedIbGibAddr, parseSpaceQualifiedIbGibAddr } from './engine/index/index-helper.mjs';
-import { B2tFSItemIbGib_V1 } from './engine/item/item-types.mjs';
 
 const lc = `[apps/vcs-gib/src/vcs-gib.respec.node.mts]`;