@ibgib/vcs-gib 0.0.26 → 0.0.30

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 });
+        }
+    });
 });
 
+

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

@@ -25,7 +25,7 @@ import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
 import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-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';
-import { getB2tFSBranchSpaceName } from '../../engine/branch/branch-helper.mjs';
+import { getB2tFSBranchSpaceName, resolveContextualBranchName } from '../../engine/branch/branch-helper.mjs';
 import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
 import { getB2tFSIndexIbGib, updateB2tFSIndexIbGib, getSpaceQualifiedIbGibAddr } from '../../engine/index/index-helper.mjs';
 import { B2tFSStagedItemRecord } from '../../engine/index/index-types.mjs';
@@ -85,7 +85,11 @@ export async function executeCommitCmd({
             throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f)`);
         }
 
-        const branchName = indexIbGib.data?.activeBranch || 'main';
+        const branchName = resolveContextualBranchName({
+            targetDir: absTargetDir,
+            repoRoot,
+            indexIbGib,
+        });
         const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
 
         // Target active branch space b2s_<activeBranch>

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

@@ -15,6 +15,7 @@ import { CommentIbGib_V1 } from '@ibgib/core-gib/dist/common/comment/comment-typ
 
 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 { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
 import { B2tFSItemIbGib_V1, B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
 import { B2tFSBranchIbGib_V1 } from '../../engine/branch/branch-types.mjs';
@@ -84,7 +85,11 @@ export async function executeLogCmd({
             throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a)`);
         }
 
-        const branchName = indexIbGib.data?.activeBranch || 'main';
+        const branchName = resolveContextualBranchName({
+            targetDir: absTargetDir,
+            repoRoot,
+            indexIbGib,
+        });
 
         // Target active branch space b2s_<activeBranch>
         const { space: activeSpace } = await getOrCreateBranchSpace({

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

@@ -66,6 +66,7 @@ export async function executeStatusCmd({
             localSpace,
             vcsPath,
             repoRoot,
+            targetDir: absTargetDir,
             vcsFolderName,
         });
 

package/src/engine/branch/branch-helper.mts

@@ -5,6 +5,7 @@
  * and branch timeline tracking.
  */
 
+import path from 'node:path';
 import { getUUID } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
 import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
@@ -77,3 +78,35 @@ export async function createB2tFSBranchIbGib(opts: {
 
     return branchIbGib;
 }
+
+/**
+ * Resolves the contextual branch name given the target directory and repository root.
+ * If targetDir is physically located inside a secondary branch worktree (`repoRoot/b/<branchName>`),
+ * that worktree's branchName is returned. Otherwise, the index's activeBranch (defaulting to 'main') is returned.
+ */
+export function resolveContextualBranchName({
+    targetDir,
+    repoRoot,
+    indexIbGib,
+}: {
+    targetDir: string;
+    repoRoot: string;
+    indexIbGib?: { data?: { activeBranch?: string } } | null;
+}): string {
+    const absTarget = path.resolve(targetDir);
+    const absRoot = path.resolve(repoRoot);
+    const rel = path.relative(absRoot, absTarget).replace(/\\/g, '/');
+
+    if (rel.startsWith('b/') || rel === 'b') {
+        const parts = rel.split('/').filter(Boolean);
+        if (parts.length >= 2 && parts[0] === 'b') {
+            const candidateBranch = parts[1];
+            if (candidateBranch) {
+                return candidateBranch;
+            }
+        }
+    }
+
+    return indexIbGib?.data?.activeBranch || 'main';
+}
+

package/src/engine/status/status-helper.mts

@@ -16,6 +16,7 @@ import { isPathFiltered, parseFilterFileContent } from '../filter/glob-helper.mj
 import { getB2tFSIndexIbGib } from '../index/index-helper.mjs';
 import { B2tFSStagedItemRecord } from '../index/index-types.mjs';
 import { getOrCreateBranchSpace } from '../branch/branch-space-helper.mjs';
+import { resolveContextualBranchName } from '../branch/branch-helper.mjs';
 
 export interface VcsStatusItem {
     path: string;
@@ -194,16 +195,18 @@ export async function getRepoStatus({
     localSpace,
     vcsPath,
     repoRoot,
+    targetDir = repoRoot,
     vcsFolderName = '.vcsgib',
 }: {
     metaspace: any;
     localSpace: any;
     vcsPath: string;
     repoRoot: string;
+    targetDir?: string;
     vcsFolderName?: string;
 }): Promise<RepoStatusResult> {
     const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
-    const branchName = indexIbGib?.data?.activeBranch || 'main';
+    const branchName = resolveContextualBranchName({ targetDir, repoRoot, indexIbGib });
     const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
 
     const { space: activeBranchSpace } = await getOrCreateBranchSpace({