@ibgib/vcs-gib 0.0.32 → 0.0.34

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

@@ -1,142 +0,0 @@
-/**
- * @module branch-cmd
- * 
- * CLI command handler for `vcs branch [branchName]`.
- * Delegates to executeVcsBranch 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 { executeVcsBranch } from '@ibgib/core-gib/dist/vcs/commands/branch-cmd.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 { readVcsIndexProjectionFromDisk, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-
-const lcFile = `[branch-cmd]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface BranchInfo {
-    name: string;
-    isActive: boolean;
-    addr: string;
-    rootItemAddr?: string;
-}
-
-export interface BranchCmdOpts {
-    branchName?: string;
-    itemPath?: string;
-    targetDir?: string;
-    vcsFolderName?: string;
-    quiet?: boolean;
-}
-
-export interface BranchCmdResult {
-    branches: BranchInfo[];
-    createdBranchName?: string;
-    createdBranchAddr?: string;
-}
-
-export async function executeBranchCmd({
-    branchName,
-    itemPath,
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    quiet = false,
-}: BranchCmdOpts = {}): Promise<BranchCmdResult> {
-    const lc = `${lcFile}[${executeBranchCmd.name}]`;
-    try {
-        if (logalot) { console.log(`${lc} starting... (I: 4c3d2e1f0a9b8c7d6e5f4a3b2c1d0e9f)`); }
-
-        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: 5d4e3f2a1b0c9d8e7f6a5b4c3d2e1f0a)`);
-        }
-
-        // 1. Fetch authoritative repository index from localSpace
-        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
-        if (!indexIbGib) {
-            throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 6e5f4a3b2c1d0e9f8a7b6c5d4e3f2a1b)`);
-        }
-
-        const activeBranchName = resolveContextualBranchName({
-            targetDir: absTargetDir,
-            repoRoot,
-            indexIbGib,
-        });
-
-        // Resolve active branch space b2s_<activeBranch>
-        const { space: activeBranchSpace } = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: activeBranchName,
-        });
-
-        // If creating a branch, ensure target branch space exists on Node
-        if (branchName && branchName.trim().length > 0) {
-            await getOrCreateBranchSpace({
-                metaspace,
-                vcsPath,
-                branchName: branchName.trim(),
-            });
-        }
-
-        const branchRes = await executeVcsBranch({
-            metaspace,
-            localSpace,
-            activeBranchSpace,
-            indexIbGib,
-            branchName,
-            itemPath,
-            repoRoot,
-            targetDir: absTargetDir,
-            vcsFolderName,
-        });
-
-        if (branchRes.updatedIndex) {
-            await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: branchRes.updatedIndex });
-        }
-
-        const branches: BranchInfo[] = branchRes.branches.map(b => ({
-            name: b.name,
-            isActive: b.isActive,
-            addr: b.commitAddr || '',
-            rootItemAddr: b.rootItemAddr,
-        }));
-
-        if (!quiet) {
-            if (!branchName) {
-                for (const b of branches) {
-                    const prefix = b.isActive ? '* ' : '  ';
-                    console.log(`${prefix}${b.name}`);
-                }
-            } else {
-                console.log(`Created branch '${branchRes.createdBranchName}'`);
-            }
-        }
-
-        return {
-            branches,
-            createdBranchName: branchRes.createdBranchName,
-            createdBranchAddr: branchRes.createdBranchAddr,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)`);
-        throw error;
-    } finally {
-        if (logalot) { console.log(`${lc} complete. (I: 2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b)`); }
-    }
-}

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

@@ -1,123 +0,0 @@
-/**
- * @module checkout-cmd
- * 
- * CLI command handler for `vcs checkout <branchName>`.
- * Bootstraps workspace projection space, delegates to executeVcsCheckout, and writes projection cache.
- */
-
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { executeVcsCheckout } from '@ibgib/core-gib/dist/vcs/commands/checkout-cmd.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, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-
-const lcFile = `[checkout-cmd]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface CheckoutCmdOpts {
-    branchName?: string;
-    targetDir?: string;
-    vcsFolderName?: string;
-    quiet?: boolean;
-}
-
-export interface CheckoutCmdResult {
-    previousBranch: string;
-    currentBranch: string;
-    worktreePath: string;
-}
-
-export async function executeCheckoutCmd({
-    branchName,
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    quiet = false,
-}: CheckoutCmdOpts = {}): Promise<CheckoutCmdResult> {
-    const lc = `${lcFile}[${executeCheckoutCmd.name}]`;
-    try {
-        if (logalot) { console.log(`${lc} starting... (I: 3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e)`); }
-
-        const trimmedBranchName = branchName?.trim();
-        if (!trimmedBranchName) {
-            throw new Error(`Branch name is required for checkout (E: 4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d)`);
-        }
-
-        const absTargetDir = path.resolve(targetDir);
-
-        const { metaspace, localSpace, repoRoot, vcsPath } = 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: 5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0e)`);
-        }
-
-        // 1. Fetch authoritative repository index from localSpace
-        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
-        if (!indexIbGib) {
-            throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f)`);
-        }
-
-        // 2. Resolve target branch space b2s_<branchName>
-        const targetBranchSpaceRes = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: trimmedBranchName,
-        });
-        const targetBranchSpace = targetBranchSpaceRes.space;
-
-        const isDefaultBranch = trimmedBranchName === 'main';
-        const worktreePath = isDefaultBranch
-            ? repoRoot
-            : path.join(repoRoot, 'b', trimmedBranchName);
-
-        await fs.mkdir(worktreePath, { recursive: true });
-
-        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
-            metaspace,
-            workspaceRoot: worktreePath,
-            vcsFolderName,
-            backingSpace: targetBranchSpace,
-        });
-
-        const checkoutRes = await executeVcsCheckout({
-            metaspace,
-            localSpace,
-            targetBranchSpace,
-            workspaceSpace,
-            indexIbGib,
-            branchName: trimmedBranchName,
-            repoRoot,
-            targetDir: absTargetDir,
-            vcsFolderName,
-        });
-
-        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: checkoutRes.updatedIndex });
-
-        if (!quiet) {
-            console.log(`Switched to branch '${trimmedBranchName}' (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)`);
-            console.log(`Worktree path: ${worktreePath}`);
-        }
-
-        return {
-            previousBranch: checkoutRes.previousBranch,
-            currentBranch: checkoutRes.currentBranch,
-            worktreePath,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
-        throw error;
-    } finally {
-        if (logalot) { console.log(`${lc} complete. (I: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`); }
-    }
-}

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

@@ -1,130 +0,0 @@
-/**
- * @module commit-cmd
- * 
- * CLI command handler for `vcs commit -m <message>`.
- * Bootstraps workspace projection space and delegates to executeVcsCommit.
- */
-
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { executeVcsCommit } from '@ibgib/core-gib/dist/vcs/commands/commit-cmd.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, writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-
-const lcFile = `[commit-cmd]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface CommitCmdOpts {
-    message?: string;
-    targetDir?: string;
-    vcsFolderName?: string;
-    author?: string;
-    quiet?: boolean;
-}
-
-export interface CommitCmdResult {
-    branchName: string;
-    commitAddr: string;
-    commentAddr?: string;
-    rootItemAddr: string;
-    committedPaths: string[];
-    ingestedCommentsCount: number;
-}
-
-export async function executeCommitCmd({
-    message,
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    author = 'vcs-user',
-    quiet = false,
-}: CommitCmdOpts = {}): Promise<CommitCmdResult> {
-    const lc = `${lcFile}[${executeCommitCmd.name}]`;
-    try {
-        if (logalot) { console.log(`${lc} starting... (I: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`); }
-
-        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: 2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d)`);
-        }
-
-        // Fetch authoritative B2tFSIndexIbGib_V1 from space
-        const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
-        if (!indexIbGib) {
-            throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d)`);
-        }
-
-        const branchName = resolveContextualBranchName({
-            targetDir: absTargetDir,
-            repoRoot,
-            indexIbGib,
-        });
-        const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
-
-        // Resolve active branch space b2s_<branchName>
-        const { space: activeSpace } = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName,
-        });
-
-        const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
-            metaspace,
-            workspaceRoot: activeWorktreeDir,
-            vcsFolderName,
-            backingSpace: activeSpace,
-        });
-
-        const commitRes = await executeVcsCommit({
-            metaspace,
-            localSpace,
-            activeBranchSpace: activeSpace,
-            workspaceSpace,
-            indexIbGib,
-            message,
-            author,
-            repoRoot,
-            targetDir: absTargetDir,
-            vcsFolderName,
-        });
-
-        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: commitRes.updatedIndex });
-
-        if (!quiet) {
-            console.log(`[${branchName} ${commitRes.commitAddr.slice(0, 7)}] ${message || '(companion comments committed)'}`);
-            console.log(` ${commitRes.committedPaths.length} file(s) changed`);
-            if (commitRes.ingestedCommentsCount > 0) {
-                console.log(` ${commitRes.ingestedCommentsCount} companion comment(s) attached and merged`);
-            }
-        }
-
-        return {
-            branchName: commitRes.branchName,
-            commitAddr: commitRes.commitAddr,
-            commentAddr: commitRes.commentAddr,
-            rootItemAddr: commitRes.rootItemAddr,
-            committedPaths: commitRes.committedPaths,
-            ingestedCommentsCount: commitRes.ingestedCommentsCount,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c)`);
-        throw error;
-    } finally {
-        if (logalot) { console.log(`${lc} complete. (I: 7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d)`); }
-    }
-}

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

@@ -1,99 +0,0 @@
-/**
- * @module init-cmd
- * 
- * CLI command handler for `vcs init [targetDir]`.
- * Bootstraps Node environment, creates disk directories, and delegates to executeVcsInit.
- */
-
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { executeVcsInit } from '@ibgib/core-gib/dist/vcs/commands/init-cmd.mjs';
-
-import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
-import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
-import { writeVcsIndexProjectionToDisk } from '../vcs-projection-helper.mjs';
-import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
-
-const lcFile = `[init-cmd]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface InitCmdOpts {
-    targetDir?: string;
-    vcsFolderName?: string;
-    defaultBranchName?: string;
-    quiet?: boolean;
-}
-
-export interface InitCmdResult {
-    vcsPath: string;
-    spaceId: string;
-    branchName: string;
-    rootItemIb: string;
-}
-
-export async function executeInitCmd({
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    defaultBranchName = 'main',
-    quiet = false,
-}: InitCmdOpts = {}): Promise<InitCmdResult> {
-    const lc = `${lcFile}[${executeInitCmd.name}]`;
-    try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: 8a9b10c11d12e13f14a15b16c17d18e1)`);
-        }
-
-        const absTargetDir = path.resolve(targetDir);
-        const vcsPath = path.join(absTargetDir, vcsFolderName);
-
-        // Create target repository folder if it doesn't exist
-        await fs.mkdir(absTargetDir, { recursive: true });
-
-        // Bootstrap Metaspace
-        const { metaspace, localSpace } = await bootstrapVcsMetaspace({
-            repoPath: absTargetDir,
-            vcsFolderName,
-            defaultSpaceName: `vcs_${path.basename(absTargetDir).replace(/[^a-zA-Z0-9_\-]/g, '_')}`,
-        });
-
-        // Initialize b2s_main branch space
-        const { space: branchSpace, spaceId } = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: defaultBranchName,
-        });
-
-        const folderName = path.basename(absTargetDir) || 'root';
-
-        const initRes = await executeVcsInit({
-            metaspace,
-            branchSpace,
-            localSpace,
-            rootFolderName: folderName,
-            defaultBranchName,
-            vcsFolderName,
-        });
-
-        await writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib: initRes.indexIbGib });
-
-        if (!quiet) {
-            console.log(`Initialized empty ibgib repository in ${vcsPath} (branch: ${defaultBranchName}) (I: 3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f)`);
-        }
-
-        return {
-            vcsPath,
-            spaceId: initRes.spaceId,
-            branchName: initRes.branchName,
-            rootItemIb: initRes.rootItem.ib,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d)`);
-        throw error;
-    } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e)`);
-        }
-    }
-}

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

@@ -1,143 +0,0 @@
-/**
- * @module merge-cmd
- * 
- * 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 { 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 '@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 = `[merge-cmd]`;
-const logalot = GLOBAL_LOG_A_LOT;
-
-export interface MergeCmdOpts {
-    incomingBranchName?: string;
-    targetDir?: string;
-    vcsFolderName?: string;
-    quiet?: boolean;
-}
-
-export interface MergeCmdResult {
-    baseBranch: string;
-    incomingBranch: string;
-    baseSpaceId: string;
-    incomingSpaceId: string;
-    mergedBranchAddr?: string;
-    worktreePath: string;
-}
-
-export async function executeMergeCmd({
-    incomingBranchName,
-    targetDir = process.cwd(),
-    vcsFolderName = '.vcsgib',
-    quiet = false,
-}: MergeCmdOpts = {}): Promise<MergeCmdResult> {
-    const lc = `${lcFile}[${executeMergeCmd.name}]`;
-    try {
-        if (logalot) {
-            console.log(`${lc} starting... (I: 4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f)`);
-        }
-
-        const trimmedIncomingBranch = incomingBranchName?.trim();
-        if (!trimmedIncomingBranch) {
-            throw new Error(`Branch name is required for merge (E: 5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a)`);
-        }
-
-        const absTargetDir = path.resolve(targetDir);
-
-        const { metaspace, localSpace, repoRoot, vcsPath } = 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: 6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b)`);
-        }
-
-        // 1. Fetch authoritative repository index from localSpace
-        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';
-
-        // 2. Resolve base branch space & incoming branch space
-        const baseSpaceRes = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: baseBranchName,
-        });
-        const baseSpace = baseSpaceRes.space;
-
-        const incomingSpaceRes = await getOrCreateBranchSpace({
-            metaspace,
-            vcsPath,
-            branchName: trimmedIncomingBranch,
-        });
-        const incomingSpace = incomingSpaceRes.space;
-
-        const isDefaultBranch = baseBranchName === 'main';
-        const worktreePath = isDefaultBranch
-            ? repoRoot
-            : path.join(repoRoot, 'b', baseBranchName);
-
-        await fs.mkdir(worktreePath, { recursive: true });
-
-        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: mergeRes.baseBranch,
-            incomingBranch: mergeRes.incomingBranch,
-            baseSpaceId: baseSpaceRes.spaceId,
-            incomingSpaceId: incomingSpaceRes.spaceId,
-            mergedBranchAddr: mergeRes.mergeCommitAddr,
-            worktreePath,
-        };
-    } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: 2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b)`);
-        throw error;
-    } finally {
-        if (logalot) {
-            console.log(`${lc} complete. (I: 3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c)`);
-        }
-    }
-}