Function handleGetMergeBase

projects/electron/src/modules/code/git.ts:823–860

* Get the merge-base commit between the worktree's HEAD and a target branch

(params: GetMergeBaseParams)

 * Get the merge-base commit between the worktree's HEAD and a target branch
 */
async function handleGetMergeBase(params: GetMergeBaseParams): Promise<GetMergeBaseResponse> {
    const startTime = Date.now()
    logger.info("[Git:getMergeBase] Finding merge-base", JSON.stringify({
        repoDir: params.repoDir,
        workTreeId: params.workTreeId,
        targetBranch: params.targetBranch,
    }))

    try {
        validateRepoDir(params.repoDir)
        validateWorkTreeId(params.workTreeId)

        const worktreePath = getWorktreePath(params.workTreeId)

        // Validate worktree exists
        if (!fs.existsSync(worktreePath)) {
            throw new Error(`Worktree does not exist: ${worktreePath}`)
        }

        // Find merge-base between HEAD and target branch
        const mergeBaseResult = await execGit(["merge-base", "HEAD", params.targetBranch], worktreePath)

        if (!mergeBaseResult.success) {
            throw new Error(`Failed to find merge-base: ${mergeBaseResult.stderr}`)
        }

        const mergeBaseCommit = mergeBaseResult.stdout.trim()
        if (!mergeBaseCommit) {
            throw new Error("No merge-base found")
        }

        logger.info("[Git:getMergeBase] Found merge-base", JSON.stringify({ mergeBaseCommit, duration: Date.now() - startTime }))
        return { mergeBaseCommit }
    } catch (error: any) {
        logger.error("[Git:getMergeBase] Error:", JSON.stringify({ error: error.message, stack: error.stack, duration: Date.now() - startTime }))
        throw error
    }
}

/**
 * Parse stats from a unified diff patch