@ibgib/vcs-gib 0.0.30 → 0.0.33

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

@@ -1,168 +0,0 @@
-/**
- * @module status-cmd
- * 
- * Command handler for `vcs status`.
- * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
- */
-
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.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;
-
-export { VcsStatusItem, PendingCommentInfo };
-
-export interface StatusCmdResult {
-    branchName: string;
-    staged: VcsStatusItem[];
-    modified: VcsStatusItem[];
-    deleted: VcsStatusItem[];
-    untracked: VcsStatusItem[];
-    pendingComments: PendingCommentInfo[];
-}
-
-export interface StatusCmdOpts {
-    targetDir?: string;
-    vcsFolderName?: string;
-    quiet?: boolean;
-    comments?: boolean;
-}
-
-export async function executeStatusCmd({
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    quiet = false,
-    comments = false,
-}: StatusCmdOpts = {}): Promise<StatusCmdResult> {
-    const lc = `${lcFile}[${executeStatusCmd.name}]`;
-
-    try {
-        if (logalot) {
-            console.log(`${lc} starting executeStatusCmd (I: 7a8b9c10d11e12f13a14b15c16d17e18)`);
-        }
-
-        const absTargetDir = path.resolve(targetDir);
-
-        const { metaspace, localSpace, vcsPath, repoRoot } = await bootstrapVcsMetaspace({
-            repoPath: absTargetDir,
-            vcsFolderName,
-        });
-
-        // Verify repo exists
-        try {
-            await fs.access(vcsPath);
-        } catch {
-            throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 4d5e6f7a8b9c10d11e12f13a14b15c6d)`);
-        }
-
-        const statusRes = await getRepoStatus({
-            metaspace,
-            localSpace,
-            vcsPath,
-            repoRoot,
-            targetDir: absTargetDir,
-            vcsFolderName,
-        });
-
-        const { branchName, staged, modified, deleted, untracked, pendingComments } = statusRes;
-
-        const commentsByTarget = new Map<string, PendingCommentInfo[]>();
-        for (const c of pendingComments) {
-            const list = commentsByTarget.get(c.targetRelPath) || [];
-            list.push(c);
-            commentsByTarget.set(c.targetRelPath, list);
-        }
-
-        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}`);
-                            }
-                        }
-                    }
-                }
-            }
-
-            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}`);
-                            }
-                        }
-                    }
-                }
-                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}`);
-                }
-            }
-
-            // 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 (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0) {
-                console.log('nothing to commit, working tree clean');
-            }
-        }
-
-        return {
-            branchName,
-            staged,
-            modified,
-            deleted,
-            untracked,
-            pendingComments,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 5e6f7a8b9c10d11e12f13a14b15c6d7e)`);
-        throw error;
-    } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 6f7a8b9c10d11e12f13a14b15c6d7e8f)`);
-        }
-    }
-}

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

@@ -1,117 +0,0 @@
-/**
- * @module branch-graph-helper
- * 
- * Helper for populating branch spaces via SyncSagaCoordinator.
- */
-
-import { clone, extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
-import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
-import { MetaspaceService } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-types.mjs';
-import { SyncSagaCoordinator } from '@ibgib/core-gib/dist/sync/sync-saga-coordinator.mjs';
-import { SyncPeerInnerspace_V1 } from '@ibgib/core-gib/dist/sync/sync-peer/sync-peer-innerspace/sync-peer-innerspace-v1.mjs';
-import { SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1 } from '@ibgib/core-gib/dist/sync/sync-peer/sync-peer-innerspace/sync-peer-innerspace-constants.mjs';
-
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { B2tFSBranchIbGib_V1 } from './branch-types.mjs';
-import { createB2tFSBranchIbGib } from './branch-helper.mjs';
-
-const lcFile = `[branch-graph-helper]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface PopulateBranchSpaceFromGraphOpts {
-    sourceSpace: IbGibSpaceAny;
-    targetBranchSpace: IbGibSpaceAny;
-    rootItemIbGib: IbGib_V1;
-    branchName?: string;
-    metaspace?: MetaspaceService;
-}
-
-export interface PopulateBranchSpaceFromGraphResult {
-    syncedCount: number;
-    branchIbGib?: B2tFSBranchIbGib_V1;
-}
-
-/**
- * Executes SSM (Space - Sync - Metadata) for branch space initialization:
- * 1. Space: Target branch space targetBranchSpace (b2s_<branchName>).
- * 2. Sync: Syncs rootItemIbGib from sourceSpace -> targetBranchSpace using SyncSagaCoordinator.
- * 3. Metadata: Creates B2tFSBranchIbGib_V1 metadata node in targetBranchSpace pointing to rootItem.
- */
-export async function populateBranchSpaceFromGraph({
-    sourceSpace,
-    targetBranchSpace,
-    rootItemIbGib,
-    branchName,
-    metaspace,
-}: PopulateBranchSpaceFromGraphOpts): Promise<PopulateBranchSpaceFromGraphResult> {
-    const lc = `${lcFile}[${populateBranchSpaceFromGraph.name}]`;
-    try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
-        }
-
-        if (!sourceSpace || !targetBranchSpace || !rootItemIbGib || !metaspace) {
-            throw new Error(`sourceSpace, targetBranchSpace, rootItemIbGib, and metaspace are required (E: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`);
-        }
-
-        // 1. Space: targetBranchSpace provided/instantiated
-
-        // 2. Sync: Execute SyncSagaCoordinator space-to-space sync (sourceSpace -> targetBranchSpace)
-        const senderCoordinator = new SyncSagaCoordinator();
-        const receiverCoordinator = new SyncSagaCoordinator();
-
-        const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
-        await peer.initialized;
-        await peer.initializeOpts({
-            localMetaspace: metaspace,
-            localSpace: sourceSpace,
-            receiverSpace: targetBranchSpace,
-            receiverCoordinator,
-            receiverMetaspace: metaspace,
-        });
-
-        const resSync = await senderCoordinator.sync({
-            peer,
-            localSpace: sourceSpace,
-            metaspace,
-            domainIbGibs: [rootItemIbGib],
-        });
-
-        await resSync.done;
-
-        if (logalot) {
-            console.log(`${lc} SyncSagaCoordinator sync initiated for ${rootItemIbGib.ib} (I: 3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f)`);
-        }
-
-        const syncedCount = 1;
-
-        // 3. Metadata: Create B2tFSBranchIbGib_V1 metadata node in targetBranchSpace pointing to rootItem
-        let branchIbGib: B2tFSBranchIbGib_V1 | undefined;
-        if (branchName && metaspace) {
-            branchIbGib = await createB2tFSBranchIbGib({
-                branchName,
-                rootItem: rootItemIbGib as any,
-                space: targetBranchSpace,
-                metaspace,
-            });
-        }
-
-        if (logalot) {
-            console.log(`${lc} Populated target branch space via SyncSagaCoordinator (I: 4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f)`);
-        }
-
-        return {
-            syncedCount,
-            branchIbGib,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a)`);
-        throw error;
-    } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b)`);
-        }
-    }
-}
-

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

@@ -1,112 +0,0 @@
-/**
- * @module branch-helper
- * 
- * B2tFS Branch Helper functions: dedicated branch spaces (`b2s_...`), branch creation,
- * 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';
-import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.mjs';
-import { MetaspaceService } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-types.mjs';
-import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
-import { putInSpace, persistTransformResult } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { B2tFSBranchIbGib_V1, B2tFSBranchData_V1, B2tFSBranchRel8ns_V1 } from './branch-types.mjs';
-import { B2tFSItemIbGib_V1 } from '../item/item-types.mjs';
-
-const lcFile = `[branch-helper]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export const B2TFS_BRANCH_SPACE_PREFIX = 'b2s_';
-
-/**
- * Generates a dedicated branch space name.
- * Example: 'main' -> 'b2s_main'
- */
-export function getB2tFSBranchSpaceName(branchName: string): string {
-    const safeName = branchName.replace(/[^a-zA-Z0-9_\-]/g, '_');
-    return `${B2TFS_BRANCH_SPACE_PREFIX}${safeName}`;
-}
-
-/**
- * Creates a new B2tFSBranchIbGib pointing to a root folder item.
- */
-export async function createB2tFSBranchIbGib(opts: {
-    branchName: string;
-    rootItem: B2tFSItemIbGib_V1;
-    space: IbGibSpaceAny;
-    metaspace: MetaspaceService;
-}): Promise<B2tFSBranchIbGib_V1> {
-    const lc = `${lcFile}[${createB2tFSBranchIbGib.name}]`;
-    const { branchName, rootItem, space, metaspace } = opts;
-
-    if (!branchName || !rootItem) {
-        throw new Error(`branchName and rootItem required (E: 9012a472c9104b2d)`);
-    }
-
-    const uuid = await getUUID();
-    const rootAddr = getIbGibAddr({ ibGib: rootItem });
-
-    const data: B2tFSBranchData_V1 = {
-        name: branchName,
-        uuid,
-        classname: 'B2tFSBranchIbGib_V1',
-    };
-
-    const rel8ns: B2tFSBranchRel8ns_V1 = {
-        b2tfs_item: [rootAddr],
-    };
-
-    const res = await Factory_V1.firstGen({
-        parentIbGib: ROOT,
-        ib: `b2tfs_branch ${branchName} v1 ${uuid}`,
-        data,
-        rel8ns,
-    });
-
-    const branchIbGib = res.newIbGib as B2tFSBranchIbGib_V1;
-    await persistTransformResult({ resTransform: res, space });
-    await metaspace.registerNewIbGib({ ibGib: branchIbGib });
-
-    if (logalot) {
-        console.log(`${lc} Created branch IbGib: ${branchIbGib.ib}`);
-    }
-
-    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/branch/branch-space-helper.mts

@@ -1,110 +0,0 @@
-/**
- * @module branch-space-helper
- * 
- * Helper for managing dedicated branch spaces (`b2s_...`) in metaspace.
- */
-
-import { clone, extractErrorMsg, getUUID } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
-import { Metaspace_Nodespace } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace.mjs';
-import { NodeFilesystemSpace_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-v1.mjs';
-import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-types.mjs';
-import { putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { getB2tFSBranchSpaceName } from './branch-helper.mjs';
-
-export {
-    populateBranchSpaceFromGraph,
-    PopulateBranchSpaceFromGraphOpts,
-    PopulateBranchSpaceFromGraphResult,
-} from './branch-graph-helper.mjs';
-
-const lcFile = `[branch-space-helper]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface GetOrCreateBranchSpaceOpts {
-    metaspace: Metaspace_Nodespace;
-    vcsPath: string;
-    branchName: string;
-}
-
-export interface GetOrCreateBranchSpaceResult {
-    space: NodeFilesystemSpace_V1;
-    spaceId: string;
-    spaceName: string;
-}
-
-/**
- * Gets an existing branch space or creates and registers a new dedicated NodeFilesystemSpace_V1 in metaspace.
- */
-export async function getOrCreateBranchSpace({
-    metaspace,
-    vcsPath,
-    branchName,
-}: GetOrCreateBranchSpaceOpts): Promise<GetOrCreateBranchSpaceResult> {
-    const lc = `${lcFile}[${getOrCreateBranchSpace.name}]`;
-    try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: a1b2c3d4e5f60718293a4b5c6d7e8f9a)`);
-        }
-
-        if (!metaspace || !vcsPath || !branchName) {
-            throw new Error(`metaspace, vcsPath, and branchName are required (E: b2c3d4e5f60718293a4b5c6d7e8f9a0b)`);
-        }
-
-        const spaceName = getB2tFSBranchSpaceName(branchName);
-
-        const localSpaces = await metaspace.getLocalUserSpaces({ lock: false });
-        const existingSpace = localSpaces.find(s => s.data?.name === spaceName || s.ib === spaceName);
-
-        if (existingSpace) {
-            const spaceId = existingSpace.data?.uuid || existingSpace.data?.spaceId || spaceName;
-            if (logalot) {
-                console.log(`${lc} Found existing branch space ${spaceName} (spaceId: ${spaceId}) (I: c3d4e5f60718293a4b5c6d7e8f9a0b1c)`);
-            }
-            return {
-                space: existingSpace as NodeFilesystemSpace_V1,
-                spaceId,
-                spaceName,
-            };
-        }
-
-        const spaceUuid = await getUUID();
-        const spaceData = {
-            ...clone(DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1),
-            uuid: spaceUuid,
-            isTjp: true,
-            name: spaceName,
-            baseDir: vcsPath,
-            spaceSubPath: spaceName,
-        };
-
-        const space = new NodeFilesystemSpace_V1(spaceData);
-        space.gib = await getGib({ ibGib: space, hasTjp: true });
-        await space.initialized;
-
-        await putInSpace({ space: metaspace.zeroSpace, ibGib: space });
-        await metaspace.registerNewIbGib({ ibGib: space });
-        if (metaspace.fnUpdateBootstrap) {
-            await metaspace.fnUpdateBootstrap(space);
-        }
-
-        if (logalot) {
-            console.log(`${lc} Created new branch space ${spaceName} (spaceId: ${spaceUuid}) (I: d4e5f60718293a4b5c6d7e8f9a0b1c2d)`);
-        }
-
-        return {
-            space,
-            spaceId: spaceUuid,
-            spaceName,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: e5f60718293a4b5c6d7e8f9a0b1c2d3e)`);
-        throw error;
-    } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: f60718293a4b5c6d7e8f9a0b1c2d3e4f)`);
-        }
-    }
-}

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

@@ -1,29 +0,0 @@
-/**
- * @module branch-types
- * 
- * B2tFS Branch type definitions.
- */
-
-import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
-import { IbGibData_V1, IbGibRel8ns_V1, IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
-
-export interface B2tFSBranchData_V1 extends IbGibData_V1 {
-    /**
-     * Branch name (e.g. 'main', 'feature/login')
-     */
-    name: string;
-    /**
-     * Relative path from repository root to working directory
-     */
-    relativePathFromMetaspaceToFSPath?: string;
-}
-
-export interface B2tFSBranchRel8ns_V1 extends IbGibRel8ns_V1 {
-    /**
-     * Link pointing to the root folder B2tFSItemIbGib_V1
-     */
-    b2tfs_item?: IbGibAddr[];
-}
-
-export interface B2tFSBranchIbGib_V1 extends IbGib_V1<B2tFSBranchData_V1, B2tFSBranchRel8ns_V1> {
-}