@ibgib/vcs-gib 0.0.30 → 0.0.32

package/dist/cli/commands/merge-cmd.mjs

@@ -1,42 +1,22 @@
 /**
  * @module merge-cmd
  *
- * Command handler for `vcs merge <branchName>`.
- * Merges the incoming branch into the base (active/current) branch using
- * SyncSagaCoordinator sync and 3-way graft merge strategy.
- * Projects merged branch snapshot onto the base branch physical worktree path.
- *
- * ## Terminology (matches standard git usage)
- *
- * * **base** branch / space — the branch currently checked out, the one being
- *   merged INTO (analogous to `ours` / `HEAD` in git)
- * * **incoming** branch / space — the branch whose changes are being merged IN
- *   (analogous to `theirs` / the topic branch in git)
+ * CLI command handler for `vcs merge <branchName>`.
+ * Merges incoming branch into base branch and delegates to executeVcsMerge.
  */
 import path from 'node:path';
 import fs from 'node:fs/promises';
-import { clone, extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { putInSpace, getLatestAddrs, persistTransformResult, registerNewIbGib } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { rel8 } from '@ibgib/ts-gib/dist/V1/transforms/rel8.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 { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
-import { GraftPreference } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs';
+import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
+import { executeVcsMerge } from '@ibgib/core-gib/dist/vcs/commands/merge-cmd.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
-import { writeB2tFSItemToFS, getIbGibWithMetaspaceFallback, reifyB2tFSHierarchy } from '../../engine/item/item-helper.mjs';
-import { getB2tFSIndexIbGib, updateB2tFSIndexIbGib } from '../../engine/index/index-helper.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, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-import { logBranchState, logItemState, logCheckpoint, logAddr } from '../../test/test-helpers.mjs';
 const lcFile = `[merge-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
-export async function executeMergeCmd({ incomingBranchName, targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, diagLog = false, } = {}) {
+export async function executeMergeCmd({ incomingBranchName, targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, } = {}) {
     const lc = `${lcFile}[${executeMergeCmd.name}]`;
-    const diag = (label) => { if (diagLog)
-        logCheckpoint(`merge-cmd: ${label}`); };
     try {
         if (logalot) {
             console.log(`${lc} starting... (I: 4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f)`);
@@ -58,42 +38,12 @@ export async function executeMergeCmd({ incomingBranchName, targetDir = process.
             throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b)`);
         }
         // 1. Fetch authoritative repository index from localSpace
-        const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
         if (!indexIbGib) {
             throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c)`);
         }
         const baseBranchName = indexIbGib.data?.activeBranch || 'main';
-        if (baseBranchName === trimmedIncomingBranch) {
-            throw new Error(`Cannot merge branch '${trimmedIncomingBranch}' into itself (E: 8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d)`);
-        }
-        // 2. Fetch all registered branch ibgibs
-        const branchAddrs = [
-            ...(indexIbGib.rel8ns?.branch || []),
-            ...(indexIbGib.rel8ns?.branch_tjp || []),
-        ];
-        let branchIbGibs = [];
-        if (branchAddrs.length > 0) {
-            for (const bAddr of branchAddrs) {
-                const bIbGib = await getIbGibWithMetaspaceFallback({
-                    addr: bAddr,
-                    space: localSpace,
-                    metaspace,
-                });
-                if (bIbGib) {
-                    branchIbGibs.push(bIbGib);
-                }
-            }
-        }
-        // Resolve base branch node & incoming branch node
-        const baseBranchIbGib = branchIbGibs.findLast((b) => b?.data?.name === baseBranchName);
-        if (!baseBranchIbGib) {
-            throw new Error(`Base branch '${baseBranchName}' not found in repository (E: 9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e)`);
-        }
-        const incomingBranchIbGib = branchIbGibs.findLast((b) => b?.data?.name === trimmedIncomingBranch);
-        if (!incomingBranchIbGib) {
-            throw new Error(`Branch '${trimmedIncomingBranch}' does not exist (E: 0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f)`);
-        }
-        // 3. Resolve base branch space & incoming branch space
+        // 2. Resolve base branch space & incoming branch space
         const baseSpaceRes = await getOrCreateBranchSpace({
             metaspace,
             vcsPath,
@@ -106,176 +56,40 @@ export async function executeMergeCmd({ incomingBranchName, targetDir = process.
             branchName: trimmedIncomingBranch,
         });
         const incomingSpace = incomingSpaceRes.space;
-        await putInSpace({ space: baseSpace, ibGib: baseBranchIbGib });
-        await putInSpace({ space: incomingSpace, ibGib: incomingBranchIbGib });
-        // Resolve latest branch tip inside incomingSpace (in case commits occurred on incoming branch)
-        const incomingBranchTjpAddr = incomingBranchIbGib.rel8ns?.tjp?.at(0) || getIbGibAddr({ ibGib: incomingBranchIbGib });
-        const latestIncomingBranchRes = await getLatestAddrs({ space: incomingSpace, addrs: [incomingBranchTjpAddr] });
-        const latestIncomingBranchAddr = latestIncomingBranchRes?.data?.latestAddrs?.[0] || getIbGibAddr({ ibGib: incomingBranchIbGib });
-        const latestIncomingBranchIbGib = (await getIbGibWithMetaspaceFallback({
-            addr: latestIncomingBranchAddr,
-            space: incomingSpace,
-            metaspace,
-        })) || incomingBranchIbGib;
-        const incomingRootAddr = latestIncomingBranchIbGib.rel8ns?.b2tfs_item?.at(-1);
-        if (!incomingRootAddr) {
-            throw new Error(`Incoming branch '${trimmedIncomingBranch}' has no valid root item address (E: 3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e)`);
-        }
-        const incomingRootItem = await getIbGibWithMetaspaceFallback({
-            addr: incomingRootAddr,
-            space: incomingSpace,
-            metaspace,
-        });
-        if (!incomingRootItem) {
-            throw new Error(`Incoming root item '${incomingRootAddr}' not found in incoming space (E: 4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f)`);
-        }
-        if (diagLog) {
-            diag('resolving branches & spaces');
-            await logBranchState({ label: 'baseBranch (main)', branchIbGib: baseBranchIbGib, space: baseSpace });
-            await logBranchState({ label: 'incomingBranch (feature-merge)', branchIbGib: incomingBranchIbGib, space: incomingSpace });
-            await logItemState({ label: 'incomingRootItem', itemIbGib: incomingRootItem, space: incomingSpace });
-        }
-        // 4. Setup SyncPeerInnerspace and SyncSagaCoordinator syncing incoming branch space into base branch space
-        const peer = new SyncPeerInnerspace_V1(clone(SYNC_PEER_INNERSPACE_DEFAULT_DATA_V1));
-        await peer.initialized;
-        await peer.initializeOpts({
-            localMetaspace: metaspace,
-            localSpace: incomingSpace,
-            receiverSpace: baseSpace,
-            receiverCoordinator: new SyncSagaCoordinator(),
-            receiverMetaspace: metaspace,
-        });
-        const senderCoordinator = new SyncSagaCoordinator();
-        const syncSaga = await senderCoordinator.sync({
-            peer,
-            localSpace: incomingSpace,
-            metaspace,
-            domainIbGibs: [incomingRootItem],
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            graftPreference: GraftPreference.receiver,
-        });
-        await syncSaga.done;
-        // 5. Reify the base branch filesystem hierarchy.
-        // After sync, any child timelines (files or subfolders) that were merged/advanced
-        // in baseSpace will have newer tips. reifyB2tFSHierarchy bubbles all updated child tips
-        // up through the folder DAG, evolving parents in-place and returning the newly reified root item.
-        const currentBaseRootItemAddr = baseBranchIbGib.rel8ns?.b2tfs_item?.at(-1);
-        if (!currentBaseRootItemAddr) {
-            throw new Error(`Base branch '${baseBranchName}' has no root item address (E: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
-        }
-        const reifyRes = await reifyB2tFSHierarchy({
-            rootItemAddr: currentBaseRootItemAddr,
-            space: baseSpace,
-            metaspace,
-        });
-        const reifiedRootItem = reifyRes.reifiedRootItem;
-        const reifiedRootAddr = getIbGibAddr({ ibGib: reifiedRootItem });
-        if (diagLog) {
-            diag('after reification');
-            logAddr('currentBaseRootItemAddr', currentBaseRootItemAddr);
-            logAddr('reifiedRootAddr', reifiedRootAddr);
-            console.log(`[merge-cmd] reification hasChanges:`, reifyRes.hasChanges);
-            console.log(`[merge-cmd] reifiedAddrsMap:`, JSON.stringify(reifyRes.reifiedAddrsMap));
-        }
-        // 5b. Evolve the base branch ibgib to point at the reified root item tip.
-        // The sync engine does not update branch ibgibs — branches live in
-        // their own space and are never domain ibgibs in the sync. We advance
-        // the branch pointer to the reified root item.
-        let mergedBranchAddr = getIbGibAddr({ ibGib: baseBranchIbGib });
-        if (reifyRes.hasChanges && reifiedRootAddr !== currentBaseRootItemAddr) {
-            if (diagLog) {
-                console.log(`[merge-cmd] Evolving base branch: root item changing from ${currentBaseRootItemAddr} -> ${reifiedRootAddr}`);
-            }
-            const resRel8Branch = await rel8({
-                src: baseBranchIbGib,
-                rel8nsToReplaceByAddr: {
-                    b2tfs_item: [{ oldAddr: currentBaseRootItemAddr, newAddr: reifiedRootAddr }],
-                },
-                dna: true,
-                nCounter: true,
-            });
-            const evolvedBranchIbGib = resRel8Branch.newIbGib;
-            await persistTransformResult({ resTransform: resRel8Branch, space: baseSpace });
-            await registerNewIbGib({ ibGib: evolvedBranchIbGib, space: baseSpace });
-            mergedBranchAddr = getIbGibAddr({ ibGib: evolvedBranchIbGib });
-            if (diagLog) {
-                console.log(`[merge-cmd] Base branch evolved to addr: ${mergedBranchAddr}`);
-            }
-        }
-        else {
-            if (diagLog) {
-                console.log(`[merge-cmd] Base branch root item unchanged (${currentBaseRootItemAddr})`);
-            }
-        }
-        // Update indexIbGib to reference new merged branch node
-        await updateB2tFSIndexIbGib({
-            space: baseSpace,
-            metaspace,
-            indexIbGib,
-            rel8nsToUpdate: {
-                branch: [mergedBranchAddr],
-            },
-            vcsPath,
-        });
-        const mergedRootItemAddr = reifiedRootAddr;
-        if (diagLog) {
-            diag('projecting onto disk');
-            logAddr('mergedRootItemAddr', mergedRootItemAddr);
-        }
-        // 6. Project merged branch snapshot files onto physical worktree disk
         const isDefaultBranch = baseBranchName === 'main';
         const worktreePath = isDefaultBranch
             ? repoRoot
             : path.join(repoRoot, 'b', baseBranchName);
         await fs.mkdir(worktreePath, { recursive: true });
-        if (mergedRootItemAddr) {
-            const mergedRootItem = await getIbGibWithMetaspaceFallback({
-                addr: mergedRootItemAddr,
-                space: baseSpace,
-                metaspace,
-            });
-            if (diagLog) {
-                await logItemState({ label: 'mergedRootItem to write', itemIbGib: mergedRootItem, space: baseSpace });
-            }
-            if (mergedRootItem) {
-                if (mergedRootItem.data?.fsType === 'file') {
-                    await writeB2tFSItemToFS({
-                        item: mergedRootItem,
-                        destPath: worktreePath,
-                        space: baseSpace,
-                        metaspace,
-                    });
-                }
-                else {
-                    const childAddrs = mergedRootItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
-                    for (const childAddr of childAddrs) {
-                        const childItem = await getIbGibWithMetaspaceFallback({
-                            addr: childAddr,
-                            space: baseSpace,
-                            metaspace,
-                        });
-                        if (childItem) {
-                            await writeB2tFSItemToFS({
-                                item: childItem,
-                                destPath: worktreePath,
-                                space: baseSpace,
-                                metaspace,
-                            });
-                        }
-                    }
-                }
-            }
-        }
+        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
+            metaspace,
+            workspaceRoot: worktreePath,
+            vcsFolderName,
+            backingSpace: baseSpace,
+        });
+        const mergeRes = await executeVcsMerge({
+            metaspace,
+            localSpace,
+            baseBranchSpace: baseSpace,
+            incomingBranchSpace: incomingSpace,
+            workspaceSpace,
+            indexIbGib,
+            incomingBranchName: trimmedIncomingBranch,
+            repoRoot,
+            targetDir: absTargetDir,
+            vcsFolderName,
+        });
+        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: mergeRes.updatedIndex });
         if (!quiet) {
             console.log(`Successfully merged branch '${trimmedIncomingBranch}' into '${baseBranchName}' (I: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)`);
             console.log(`  Worktree projection: ${worktreePath}`);
         }
         return {
-            baseBranch: baseBranchName,
-            incomingBranch: trimmedIncomingBranch,
+            baseBranch: mergeRes.baseBranch,
+            incomingBranch: mergeRes.incomingBranch,
             baseSpaceId: baseSpaceRes.spaceId,
             incomingSpaceId: incomingSpaceRes.spaceId,
-            mergedBranchAddr,
+            mergedBranchAddr: mergeRes.mergeCommitAddr,
             worktreePath,
         };
     }

package/dist/cli/commands/merge-cmd.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"merge-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/merge-cmd.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,mCAAmC,EAAE,MAAM,qDAAqD,CAAC;AAC1G,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,aAAa,CAAC;AAC7B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAkBjC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAClC,kBAAkB,EAClB,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAiB,EAAE;IAChB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC;IAChD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,qBAAqB,GAAG,kBAAkB,EAAE,IAAI,EAAE,CAAC;QACzD,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC;YAC7E,QAAQ,EAAE,YAAY;YACtB,aAAa;SAChB,CAAC,CAAC;QAEH,qBAAqB;QACrB,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,wDAAwD,CAAC,CAAC;QAC3H,CAAC;QAED,0DAA0D;QAC1D,MAAM,UAAU,GAAG,MAAM,8BAA8B,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACxF,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;QACzH,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,IAAI,MAAM,CAAC;QAE/D,uDAAuD;QACvD,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC;YAC9C,SAAS;YACT,OAAO;YACP,UAAU,EAAE,cAAc;SAC7B,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC;QAErC,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CAAC;YAClD,SAAS;YACT,OAAO;YACP,UAAU,EAAE,qBAAqB;SACpC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAE7C,MAAM,eAAe,GAAG,cAAc,KAAK,MAAM,CAAC;QAClD,MAAM,YAAY,GAAG,eAAe;YAChC,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QAE/C,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAElD,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,MAAM,mCAAmC,CAAC;YACxE,SAAS;YACT,aAAa,EAAE,YAAY;YAC3B,aAAa;YACb,YAAY,EAAE,SAAS;SAC1B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC;YACnC,SAAS;YACT,UAAU;YACV,eAAe,EAAE,SAAS;YAC1B,mBAAmB,EAAE,aAAa;YAClC,cAAc;YACd,UAAU;YACV,kBAAkB,EAAE,qBAAqB;YACzC,QAAQ;YACR,SAAS,EAAE,YAAY;YACvB,aAAa;SAChB,CAAC,CAAC;QAEH,MAAM,6BAA6B,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;QAEpF,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,+BAA+B,qBAAqB,WAAW,cAAc,yCAAyC,CAAC,CAAC;YACpI,OAAO,CAAC,GAAG,CAAC,0BAA0B,YAAY,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO;YACH,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,WAAW,EAAE,YAAY,CAAC,OAAO;YACjC,eAAe,EAAE,gBAAgB,CAAC,OAAO;YACzC,gBAAgB,EAAE,QAAQ,CAAC,eAAe;YAC1C,YAAY;SACf,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}

package/dist/cli/commands/reset-cmd.d.mts

@@ -1,7 +1,7 @@
 /**
  * @module reset-cmd
  *
- * Command handler for `vcs reset [path...]`.
+ * CLI command handler for `vcs reset [path...]`.
  * Unstages specified files (or all files) from active branch index in localSpace.
  */
 export interface ResetCmdOpts {

package/dist/cli/commands/reset-cmd.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"reset-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/reset-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAiBH,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,eAAe,CAAC,EAClC,KAAU,EACV,SAAyB,EACzB,aAAyB,EACzB,GAAW,EACX,GAAW,EACX,KAAa,EACb,KAAa,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAkF7C"}
+{"version":3,"file":"reset-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/reset-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkBH,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,eAAe,CAAC,EAClC,KAAU,EACV,SAAyB,EACzB,aAAyB,EACzB,GAAW,EACX,GAAW,EACX,KAAa,EACb,KAAa,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CA+E7C"}

package/dist/cli/commands/reset-cmd.mjs

@@ -1,17 +1,18 @@
 /**
  * @module reset-cmd
  *
- * Command handler for `vcs reset [path...]`.
+ * CLI command handler for `vcs reset [path...]`.
  * Unstages specified files (or all files) from active branch index in localSpace.
  */
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
 import { promptForConfirm } from '@ibgib/helper-gib/dist/helpers/node-helper.mjs';
-import { putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { executeVcsReset } from '@ibgib/core-gib/dist/vcs/commands/reset-cmd.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { getB2tFSIndexIbGib, unstagePathsFromIndex } from '../../engine/index/index-helper.mjs';
+import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
+import { readVcsIndexProjectionFromDisk, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 const lcFile = `[reset-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
@@ -34,11 +35,11 @@ export async function executeResetCmd({ paths = [], targetDir = process.cwd(), v
             throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b)`);
         }
         // Retrieve authoritative B2tFSIndexIbGib_V1 from space
-        const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
         if (!indexIbGib) {
             throw new Error(`Repository not initialized. Run 'vcs init' first. (E: 3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b)`);
         }
-        const activeBranch = indexIbGib.data?.activeBranch || 'main';
+        const activeBranch = resolveContextualBranchName({ targetDir: absTargetDir, repoRoot, indexIbGib });
         const activeWorktreeDir = activeBranch === 'main' ? repoRoot : path.join(repoRoot, 'b', activeBranch);
         const { space: activeSpace } = await getOrCreateBranchSpace({
             metaspace,
@@ -56,28 +57,25 @@ export async function executeResetCmd({ paths = [], targetDir = process.cwd(), v
                 return { unstagedPaths: [], stagedCount };
             }
         }
-        const unstageRes = await unstagePathsFromIndex({
+        const resetRes = await executeVcsReset({
+            metaspace,
+            localSpace,
+            activeBranchSpace: activeSpace,
             indexIbGib,
             paths,
-            targetDir,
-            activeWorktreeDir,
-            vcsPath,
-            space: activeSpace,
-            metaspace,
             all,
+            targetDir: absTargetDir,
+            activeWorktreeDir,
         });
-        if (localSpace !== activeSpace) {
-            await putInSpace({ space: localSpace, ibGib: unstageRes.updatedIndex });
-        }
+        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: resetRes.updatedIndex });
         if (!quiet) {
-            for (const unstagedPath of unstageRes.unstagedPaths) {
+            for (const unstagedPath of resetRes.unstagedPaths) {
                 console.log(`unstaged: ${unstagedPath}`);
             }
         }
-        const finalStagedCount = Object.keys(unstageRes.updatedIndex.data?.stagedPaths || {}).length;
         return {
-            unstagedPaths: unstageRes.unstagedPaths,
-            stagedCount: finalStagedCount,
+            unstagedPaths: resetRes.unstagedPaths,
+            stagedCount: resetRes.stagedCount,
         };
     }
     catch (error) {

package/dist/cli/commands/reset-cmd.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"reset-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/reset-cmd.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reset-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/reset-cmd.mts"],"names":[],"mappings":"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"}

package/dist/cli/commands/restore-cmd.d.mts

@@ -1,22 +1,23 @@
 /**
  * @module restore-cmd
  *
- * Command handler for `vcs restore [path...]`.
- * Restores working tree files from committed branch snapshot, or unstages files if `--staged` is set.
+ * CLI command handler for `vcs restore [path...]`.
+ * Delegates to executeVcsRestore and formats terminal output.
  */
 export interface RestoreCmdOpts {
     paths?: string[];
-    targetDir?: string;
-    vcsFolderName?: string;
     staged?: boolean;
     worktree?: boolean;
+    all?: boolean;
     yes?: boolean;
     force?: boolean;
+    targetDir?: string;
+    vcsFolderName?: string;
     quiet?: boolean;
 }
 export interface RestoreCmdResult {
-    unstagedPaths?: string[];
-    restoredPaths?: string[];
+    restoredPaths: string[];
+    unstagedPaths: string[];
 }
-export declare function executeRestoreCmd({ paths, targetDir, vcsFolderName, staged, worktree, yes, force, quiet, }?: RestoreCmdOpts): Promise<RestoreCmdResult>;
+export declare function executeRestoreCmd({ paths, staged, worktree, all, yes, force, targetDir, vcsFolderName, quiet, }?: RestoreCmdOpts): Promise<RestoreCmdResult>;
 //# sourceMappingURL=restore-cmd.d.mts.map

package/dist/cli/commands/restore-cmd.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"restore-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAiBH,MAAM,WAAW,cAAc;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,wBAAsB,iBAAiB,CAAC,EACpC,KAAU,EACV,SAAyB,EACzB,aAAyB,EACzB,MAAc,EACd,QAAgB,EAChB,GAAW,EACX,KAAa,EACb,KAAa,GAChB,GAAE,cAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA2GjD"}
+{"version":3,"file":"restore-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAkBH,MAAM,WAAW,cAAc;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wBAAsB,iBAAiB,CAAC,EACpC,KAAU,EACV,MAAc,EACd,QAAgB,EAChB,GAAW,EACX,GAAW,EACX,KAAa,EACb,SAAyB,EACzB,aAAyB,EACzB,KAAa,GAChB,GAAE,cAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoFjD"}

package/dist/cli/commands/restore-cmd.mjs

@@ -1,25 +1,26 @@
 /**
  * @module restore-cmd
  *
- * Command handler for `vcs restore [path...]`.
- * Restores working tree files from committed branch snapshot, or unstages files if `--staged` is set.
+ * CLI command handler for `vcs restore [path...]`.
+ * Delegates to executeVcsRestore and formats terminal output.
  */
 import path from 'node:path';
 import fs from 'node:fs/promises';
 import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { promptForConfirm } from '@ibgib/helper-gib/dist/helpers/node-helper.mjs';
-import { putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
+import { executeVcsRestore } from '@ibgib/core-gib/dist/vcs/commands/restore-cmd.mjs';
+import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
 import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
-import { getB2tFSIndexIbGib, unstagePathsFromIndex, restoreWorktreePathsFromSnapshot } from '../../engine/index/index-helper.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, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
 import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
 const lcFile = `[restore-cmd]`;
 const logalot = GLOBAL_LOG_A_LOT;
-export async function executeRestoreCmd({ paths = [], targetDir = process.cwd(), vcsFolderName = '.vcsgib', staged = false, worktree = false, yes = false, force = false, quiet = false, } = {}) {
+export async function executeRestoreCmd({ paths = [], staged = false, worktree = false, all = false, yes = false, force = false, targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, } = {}) {
     const lc = `${lcFile}[${executeRestoreCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1e)`);
+            console.log(`${lc} starting... (I: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
         }
         const absTargetDir = path.resolve(targetDir);
         const { metaspace, localSpace, vcsPath, repoRoot } = await bootstrapVcsMetaspace({
@@ -31,75 +32,56 @@ export async function executeRestoreCmd({ paths = [], targetDir = process.cwd(),
             await fs.access(vcsPath);
         }
         catch {
-            throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2e)`);
+            throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d)`);
         }
         // Retrieve authoritative B2tFSIndexIbGib_V1 from space
-        const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
+        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
         if (!indexIbGib) {
-            throw new Error(`Repository not initialized. Run 'vcs init' first. (E: 8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3e)`);
+            throw new Error(`Repository not initialized. Run 'vcs init' first. (E: 3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d)`);
         }
-        const activeBranch = indexIbGib.data?.activeBranch || 'main';
+        const activeBranch = resolveContextualBranchName({ targetDir: absTargetDir, repoRoot, indexIbGib });
         const activeWorktreeDir = activeBranch === 'main' ? repoRoot : path.join(repoRoot, 'b', activeBranch);
-        const { space: activeSpace } = await getOrCreateBranchSpace({
+        const { space: activeBranchSpace } = await getOrCreateBranchSpace({
             metaspace,
             vcsPath,
             branchName: activeBranch,
         });
-        const skipPrompt = yes || force || quiet || !process.stdin.isTTY;
-        if (!skipPrompt) {
-            const msg = staged
-                ? 'Unstage specified files from index?'
-                : 'Revert working tree files to committed snapshot?';
-            const confirmed = await promptForConfirm({ msg });
-            if (!confirmed) {
-                if (!quiet) {
-                    console.log('Operation cancelled.');
-                }
-                return { unstagedPaths: [], restoredPaths: [] };
-            }
+        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
+            metaspace,
+            workspaceRoot: activeWorktreeDir,
+            vcsFolderName,
+            backingSpace: activeBranchSpace,
+        });
+        const restoreRes = await executeVcsRestore({
+            metaspace,
+            localSpace,
+            activeBranchSpace,
+            workspaceSpace,
+            indexIbGib,
+            paths,
+            staged,
+            all,
+            targetDir: absTargetDir,
+            activeWorktreeDir,
+        });
+        if (staged && restoreRes.updatedIndex) {
+            await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: restoreRes.updatedIndex });
         }
-        let unstagedPaths;
-        let restoredPaths;
-        if (staged) {
-            const unstageRes = await unstagePathsFromIndex({
-                indexIbGib,
-                paths,
-                targetDir,
-                activeWorktreeDir,
-                vcsPath,
-                space: activeSpace,
-                metaspace,
-            });
-            if (localSpace !== activeSpace) {
-                await putInSpace({ space: localSpace, ibGib: unstageRes.updatedIndex });
-            }
-            unstagedPaths = unstageRes.unstagedPaths;
-            if (!quiet) {
-                for (const p of unstagedPaths) {
-                    console.log(`unstaged: ${p}`);
+        if (!quiet) {
+            if (staged) {
+                for (const unstagedPath of restoreRes.unstagedPaths) {
+                    console.log(`unstaged: ${unstagedPath}`);
                 }
             }
-        }
-        if (!staged || worktree) {
-            const restoreRes = await restoreWorktreePathsFromSnapshot({
-                paths,
-                targetDir,
-                activeWorktreeDir,
-                activeBranchSpace: activeSpace,
-                metaspace,
-                indexIbGib,
-                vcsPath,
-            });
-            restoredPaths = restoreRes.restoredPaths;
-            if (!quiet) {
-                for (const p of restoredPaths) {
-                    console.log(`restored: ${p}`);
+            else {
+                for (const restoredPath of restoreRes.restoredPaths) {
+                    console.log(`restored: ${restoredPath}`);
                 }
             }
         }
         return {
-            unstagedPaths,
-            restoredPaths,
+            restoredPaths: restoreRes.restoredPaths,
+            unstagedPaths: restoreRes.unstagedPaths,
         };
     }
     catch (error) {
@@ -108,7 +90,7 @@ export async function executeRestoreCmd({ paths = [], targetDir = process.cwd(),
     }
     finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5e)`);
+            console.log(`${lc} complete. (I: 0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5f)`);
         }
     }
 }