@ibgib/vcs-gib 0.0.23 → 0.0.29

package/dist/engine/status/status-helper.mjs

@@ -0,0 +1,286 @@
+/**
+ * @module status-helper
+ *
+ * Pure status inspection helpers and pending `.ib.*.md` comment metadata detection.
+ */
+import path from 'node:path';
+import fs from 'node:fs/promises';
+import crypto from 'node:crypto';
+import { B2TFS_CHILD_ITEM_REL8N_NAME } from '../item/item-types.mjs';
+import { getIbGibWithMetaspaceFallback } from '../item/item-helper.mjs';
+import { isPathFiltered, parseFilterFileContent } from '../filter/glob-helper.mjs';
+import { getB2tFSIndexIbGib } from '../index/index-helper.mjs';
+import { getOrCreateBranchSpace } from '../branch/branch-space-helper.mjs';
+import { resolveContextualBranchName } from '../branch/branch-helper.mjs';
+/**
+ * Returns true if filename is a `.ib.*.md` comment metadata file.
+ */
+export function isCommentMetadataFilename(filename) {
+    return filename.startsWith('.ib.') && filename.endsWith('.md') && filename.length > '.ib..md'.length;
+}
+/**
+ * Extracts the inner topic / filename from `.ib.<topic>.md`.
+ */
+export function extractCommentTopicName(filename) {
+    if (!isCommentMetadataFilename(filename)) {
+        return '';
+    }
+    return filename.slice(4, -3); // strips leading '.ib.' and trailing '.md'
+}
+/**
+ * Pure helper to walk the branch graph items.
+ */
+export async function walkBranchGraph({ item, space, metaspace, currentRelPath, outMap, }) {
+    if (!item || !item.data) {
+        return;
+    }
+    const { fsType, fileHash } = item.data;
+    if (currentRelPath) {
+        outMap.set(currentRelPath, { relPath: currentRelPath, fileHash, fsType });
+    }
+    if (fsType === 'folder') {
+        const childAddrs = item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
+        for (const childAddr of childAddrs) {
+            const childItem = await getIbGibWithMetaspaceFallback({
+                addr: childAddr,
+                space,
+                metaspace,
+            });
+            if (childItem && childItem.data) {
+                const childRelPath = currentRelPath
+                    ? `${currentRelPath}/${childItem.data.name}`
+                    : childItem.data.name;
+                await walkBranchGraph({
+                    item: childItem,
+                    space,
+                    metaspace,
+                    currentRelPath: childRelPath,
+                    outMap,
+                });
+            }
+        }
+    }
+}
+/**
+ * Pure helper to scan physical workspace, separating source files from `.ib.*.md` comment files.
+ */
+export async function scanPhysicalWorkspace({ dirPath, baseDir, vcsFolderName, filterPatterns, outSourceMap, outCommentFiles, }) {
+    let entries = [];
+    try {
+        entries = await fs.readdir(dirPath, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        const fullEntryPath = path.join(dirPath, entry.name);
+        const relPath = path.relative(baseDir, fullEntryPath).replace(/\\/g, '/');
+        // Ignore vcs storage folder, .git, and worktrees folder b
+        if (relPath === vcsFolderName || relPath.startsWith(vcsFolderName + '/') ||
+            relPath === '.git' || relPath.startsWith('.git/') ||
+            relPath === 'b' || relPath.startsWith('b/')) {
+            continue;
+        }
+        if (isPathFiltered({ relativePath: relPath, isDirectory: entry.isDirectory(), filterPatterns })) {
+            continue;
+        }
+        if (entry.isDirectory()) {
+            outSourceMap.set(relPath, { relPath, fullPath: fullEntryPath, isDirectory: true });
+            await scanPhysicalWorkspace({
+                dirPath: fullEntryPath,
+                baseDir,
+                vcsFolderName,
+                filterPatterns,
+                outSourceMap,
+                outCommentFiles,
+            });
+        }
+        else if (entry.isFile()) {
+            if (isCommentMetadataFilename(entry.name)) {
+                const parentRelPath = path.relative(baseDir, dirPath).replace(/\\/g, '/');
+                outCommentFiles.push({
+                    relPath,
+                    fullPath: fullEntryPath,
+                    parentRelPath: parentRelPath === '.' ? '' : parentRelPath,
+                    filename: entry.name,
+                });
+            }
+            else {
+                let fileHash;
+                try {
+                    const fileData = await fs.readFile(fullEntryPath);
+                    fileHash = crypto.createHash('sha256').update(fileData).digest('hex');
+                }
+                catch {
+                    // File unreadable
+                }
+                outSourceMap.set(relPath, { relPath, fullPath: fullEntryPath, isDirectory: false, fileHash });
+            }
+        }
+    }
+}
+/**
+ * Computes complete repository status, including staged, modified, deleted, untracked,
+ * and mapped pending `.ib.*.md` comment files.
+ */
+export async function getRepoStatus({ metaspace, localSpace, vcsPath, repoRoot, targetDir = repoRoot, vcsFolderName = '.vcsgib', }) {
+    const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+    const branchName = resolveContextualBranchName({ targetDir, repoRoot, indexIbGib });
+    const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
+    const { space: activeBranchSpace } = await getOrCreateBranchSpace({
+        metaspace,
+        vcsPath,
+        branchName,
+    });
+    const stagedMap = new Map();
+    const indexStagedPaths = indexIbGib?.data?.stagedPaths || {};
+    for (const [relPath, itemRec] of Object.entries(indexStagedPaths)) {
+        stagedMap.set(relPath, itemRec);
+    }
+    let rootItemAddr;
+    const branchAddrs = [
+        ...(indexIbGib?.rel8ns?.branch || []),
+        ...(indexIbGib?.rel8ns?.branch_tjp || []),
+    ];
+    if (branchAddrs.length > 0) {
+        let branchIbGibs = [];
+        for (const bAddr of branchAddrs) {
+            const bIbGib = await getIbGibWithMetaspaceFallback({
+                addr: bAddr,
+                space: activeBranchSpace,
+                metaspace,
+            });
+            if (bIbGib) {
+                branchIbGibs.push(bIbGib);
+            }
+        }
+        const activeBranchIbGib = branchIbGibs.find((b) => b?.data?.name === branchName) || branchIbGibs.at(0);
+        rootItemAddr = activeBranchIbGib?.rel8ns?.b2tFS_item?.at(0) || activeBranchIbGib?.rel8ns?.b2tfs_item?.at(0);
+    }
+    let filterPatterns = [];
+    const ignorePath = path.join(activeWorktreeDir, '.ibgibignore');
+    try {
+        const ignoreContent = await fs.readFile(ignorePath, 'utf8');
+        filterPatterns = parseFilterFileContent(ignoreContent);
+    }
+    catch {
+        // Ignore file missing is fine
+    }
+    const branchItemsMap = new Map();
+    if (rootItemAddr) {
+        const rootItem = await getIbGibWithMetaspaceFallback({
+            addr: rootItemAddr,
+            space: activeBranchSpace,
+            metaspace,
+        });
+        if (rootItem) {
+            await walkBranchGraph({
+                item: rootItem,
+                space: activeBranchSpace,
+                metaspace,
+                currentRelPath: '',
+                outMap: branchItemsMap,
+            });
+        }
+    }
+    const physicalItemsMap = new Map();
+    const rawCommentFiles = [];
+    await scanPhysicalWorkspace({
+        dirPath: activeWorktreeDir,
+        baseDir: activeWorktreeDir,
+        vcsFolderName,
+        filterPatterns,
+        outSourceMap: physicalItemsMap,
+        outCommentFiles: rawCommentFiles,
+    });
+    const staged = [];
+    const modified = [];
+    const deleted = [];
+    const untracked = [];
+    for (const [relPath, stagedRec] of stagedMap.entries()) {
+        staged.push({
+            path: relPath,
+            fsType: stagedRec.fsType || 'file',
+            status: 'staged',
+        });
+    }
+    for (const [relPath, physItem] of physicalItemsMap.entries()) {
+        if (stagedMap.has(relPath)) {
+            continue;
+        }
+        const branchItem = branchItemsMap.get(relPath);
+        if (!branchItem) {
+            untracked.push({
+                path: relPath,
+                fsType: physItem.isDirectory ? 'folder' : 'file',
+                status: 'untracked',
+            });
+        }
+        else {
+            if (!physItem.isDirectory && physItem.fileHash && branchItem.fileHash && physItem.fileHash !== branchItem.fileHash) {
+                modified.push({
+                    path: relPath,
+                    fsType: 'file',
+                    status: 'modified',
+                });
+            }
+        }
+    }
+    for (const [relPath, branchItem] of branchItemsMap.entries()) {
+        if (!relPath || relPath === '.' || relPath === '') {
+            continue;
+        }
+        if (!physicalItemsMap.has(relPath) && !stagedMap.has(relPath)) {
+            deleted.push({
+                path: relPath,
+                fsType: branchItem.fsType,
+                status: 'deleted',
+            });
+        }
+    }
+    // Map raw comment files to targets (file or folder)
+    const pendingComments = [];
+    for (const raw of rawCommentFiles) {
+        const topicName = extractCommentTopicName(raw.filename);
+        const candidateFileRelPath = raw.parentRelPath ? `${raw.parentRelPath}/${topicName}` : topicName;
+        let targetType = 'folder';
+        let targetRelPath = raw.parentRelPath;
+        if (physicalItemsMap.has(candidateFileRelPath) && !physicalItemsMap.get(candidateFileRelPath)?.isDirectory) {
+            targetType = 'file';
+            targetRelPath = candidateFileRelPath;
+        }
+        else if (branchItemsMap.has(candidateFileRelPath) && branchItemsMap.get(candidateFileRelPath)?.fsType === 'file') {
+            targetType = 'file';
+            targetRelPath = candidateFileRelPath;
+        }
+        else if (stagedMap.has(candidateFileRelPath)) {
+            targetType = 'file';
+            targetRelPath = candidateFileRelPath;
+        }
+        let content = '';
+        try {
+            content = await fs.readFile(raw.fullPath, 'utf8');
+        }
+        catch {
+            // Unreadable comment file
+        }
+        pendingComments.push({
+            commentRelPath: raw.relPath,
+            commentFullPath: raw.fullPath,
+            targetRelPath,
+            targetType,
+            topicName,
+            content,
+        });
+    }
+    return {
+        branchName,
+        activeWorktreeDir,
+        staged,
+        modified,
+        deleted,
+        untracked,
+        pendingComments,
+    };
+}
+//# sourceMappingURL=status-helper.mjs.map

package/dist/engine/status/status-helper.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibgib/vcs-gib",
-  "version": "0.0.23",
+  "version": "0.0.29",
   "private": false,
   "type": "module",
   "main": "dist/index.mjs",
@@ -22,7 +22,7 @@
     "@ibgib/helper-gib": "^0.0.37",
     "@ibgib/ts-gib": "^0.5.34",
     "@ibgib/encrypt-gib": "^0.3.1",
-    "@ibgib/core-gib": "^0.1.74",
-    "@ibgib/node-gib": "^0.0.19"
+    "@ibgib/core-gib": "^0.1.76",
+    "@ibgib/node-gib": "^0.0.21"
   }
 }

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.23';
+export const AUTO_GENERATED_VERSION = '0.0.29';

package/src/cli/cli-arg-parser.mts

@@ -18,6 +18,7 @@ import {
     VCS_PARAM_YES,
     VCS_PARAM_STAGED,
     VCS_PARAM_WORKTREE,
+    VCS_PARAM_COMMENTS,
 } from './cli-constants.mjs';
 
 export type VcsSubcommand = typeof VCS_SUBCOMMANDS[keyof typeof VCS_SUBCOMMANDS];
@@ -36,6 +37,7 @@ export interface ParsedVcsArgs {
         yes?: boolean;
         staged?: boolean;
         worktree?: boolean;
+        comments?: boolean;
     };
     rawArgs: string[];
 }
@@ -104,6 +106,9 @@ export function parseVcsArgs(argv: string[]): ParsedVcsArgs {
         } else if (matchesParam(arg, VCS_PARAM_WORKTREE)) {
             flags.worktree = true;
             i++;
+        } else if (matchesParam(arg, VCS_PARAM_COMMENTS)) {
+            flags.comments = true;
+            i++;
         } else if (!arg.startsWith('-')) {
             if (command === VCS_SUBCOMMANDS.HELP) {
                 const normalized = arg.toLowerCase();

package/src/cli/cli-constants.mts

@@ -19,10 +19,23 @@ export const VCS_SUBCOMMANDS = {
     MERGE: 'merge',
     RESET: 'reset',
     RESTORE: 'restore',
+    GENERATE_COMMENT: 'generate-comment',
+    GEN_COMMENT: 'gen-comment',
+    GEN_MSG: 'gen-msg',
+    GCOMM: 'gcomm',
+    GMSG: 'gmsg',
     HELP: 'help',
     VERSION: 'version',
 } as const;
 
+export const VCS_PARAM_COMMENTS: RCLIParamInfo = {
+    name: 'comments',
+    synonyms: ['c'],
+    description: 'Show full pending comment texts in status',
+    isFlag: true,
+    argTypeName: 'boolean',
+};
+
 export const VCS_PARAM_MESSAGE: RCLIParamInfo = {
     name: 'message',
     synonyms: ['m'],

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

@@ -20,6 +20,8 @@ import { putInSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness
 
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
+import { resolveContextualBranchName } from '../../engine/branch/branch-helper.mjs';
+import { isCommentMetadataFilename } from '../../engine/status/status-helper.mjs';
 import { getB2tFSItemIb } from '../../engine/item/item-atom-helper.mjs';
 import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
 import { getIbGibWithMetaspaceFallback, createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../../engine/item/item-helper.mjs';
@@ -78,7 +80,11 @@ export async function executeAddCmd({
             throw new Error(`Repository not initialized. Run 'vcs init' first. (E: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`);
         }
 
-        const activeBranch = indexIbGib.data?.activeBranch || 'main';
+        const activeBranch = resolveContextualBranchName({
+            targetDir: absTargetDir,
+            repoRoot,
+            indexIbGib,
+        });
         const activeWorktreeDir = activeBranch === 'main' ? repoRoot : path.join(repoRoot, 'b', activeBranch);
 
         // Target active branch space b2s_<activeBranch>
@@ -186,7 +192,7 @@ export async function executeAddCmd({
                         throw new Error(`No files matched glob pattern: ${relOrAbs} (E: e23d4c5f6a7b8c9d0e1f2a3b4c5d6e7f)`);
                     }
                 } else {
-                    const fullPath = path.resolve(targetDir, relOrAbs);
+                    const fullPath = path.isAbsolute(relOrAbs) ? relOrAbs : path.resolve(absTargetDir, relOrAbs);
                     let stat;
                     try {
                         stat = await fs.stat(fullPath);
@@ -420,7 +426,9 @@ async function addCmd_collectFilesRecursively({
                 outFiles,
             });
         } else if (entry.isFile()) {
-            outFiles.push(fullPath);
+            if (!isCommentMetadataFilename(entry.name)) {
+                outFiles.push(fullPath);
+            }
         }
     }
 }

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

@@ -19,6 +19,7 @@ import { executeBranchCmd } from './branch-cmd.mjs';
 import { executeCheckoutCmd } from './checkout-cmd.mjs';
 import { executeMergeCmd } from './merge-cmd.mjs';
 import { executeStatusCmd } from './status-cmd.mjs';
+import { executeLogCmd } from './log-cmd.mjs';
 import { logCheckpoint } from '../../test/test-helpers.mjs';
 
 const lc = `[apps/vcs-gib/src/cli/commands/branch-checkout-cmd.respec.node.mts]`;
@@ -501,5 +502,58 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
             await fs.rm(testDir, { recursive: true, force: true });
         }
     });
+
+    await ifWe(lc, `resolves contextual branch for log and status inside secondary branch worktree`, async () => {
+        const testDir = path.join(process.cwd(), '.test_contextual_worktree_branch');
+        const vcsFolderName = '.vcsgib_test_cwb';
+        try {
+            await executeInitCmd({ targetDir: testDir, vcsFolderName, quiet: true });
+
+            await fs.writeFile(path.join(testDir, 'app.ts'), 'console.log("main");\n', 'utf8');
+            await executeAddCmd({ paths: [path.join(testDir, 'app.ts')], targetDir: testDir, vcsFolderName, quiet: true });
+            await executeCommitCmd({ message: 'Main initial commit', targetDir: testDir, vcsFolderName, quiet: true });
+
+            // Create and switch to feature branch
+            await executeBranchCmd({
+                branchName: 'feature-calc',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            const checkoutRes = await executeCheckoutCmd({
+                branchName: 'feature-calc',
+                targetDir: testDir,
+                vcsFolderName,
+                quiet: true,
+            });
+            const featureWorktree = checkoutRes.worktreePath;
+            iReckon(lc, featureWorktree).isGonnaBeTruthy();
+
+            // Commit on feature branch inside worktree
+            await fs.writeFile(path.join(featureWorktree!, 'calc.ts'), 'export const add = (a, b) => a + b;\n', 'utf8');
+            await executeAddCmd({ paths: [path.join(featureWorktree!, 'calc.ts')], targetDir: featureWorktree!, vcsFolderName, quiet: true });
+            await executeCommitCmd({ message: 'Add calc on feature-calc', targetDir: featureWorktree!, vcsFolderName, quiet: true });
+
+            // Checkout main again so index.activeBranch is 'main'
+            await executeCheckoutCmd({ branchName: 'main', targetDir: testDir, vcsFolderName, quiet: true });
+
+            // Now query log from inside featureWorktree
+            const featureLogRes = await executeLogCmd({ targetDir: featureWorktree!, vcsFolderName, quiet: true });
+            iReckon(lc, featureLogRes.branchName).willEqual('feature-calc');
+            const featureMessages = featureLogRes.commits.map(c => c.message);
+            iReckon(lc, featureMessages.some(m => m.includes('Add calc on feature-calc'))).isGonnaBeTrue();
+
+            // Query status from inside featureWorktree
+            const featureStatusRes = await executeStatusCmd({ targetDir: featureWorktree!, vcsFolderName, quiet: true });
+            iReckon(lc, featureStatusRes.branchName).willEqual('feature-calc');
+
+            // Query log from main repoRoot
+            const mainLogRes = await executeLogCmd({ targetDir: testDir, vcsFolderName, quiet: true });
+            iReckon(lc, mainLogRes.branchName).willEqual('main');
+        } finally {
+            await fs.rm(testDir, { recursive: true, force: true });
+        }
+    });
 });
 
+