@plusplusoneplusplus/coc 1.0.5 → 1.0.6

package/node_modules/@plusplusoneplusplus/forge/dist/git/branch-service.js

@@ -1,846 +0,0 @@
-"use strict";
-/**
- * Pure Node.js BranchService — no VS Code dependencies.
- *
- * Provides branch listing, switching, creating, deleting, merging,
- * push/pull/fetch, stash, and status queries using git CLI.
- *
- * Extracted from `src/shortcuts/git/branch-service.ts`.
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BranchService = void 0;
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const exec_utils_1 = require("../utils/exec-utils");
-const logger_1 = require("../logger");
-/**
- * Service for branch-related git operations.
- * Handles branch listing, switching, creating, and deleting.
- */
-class BranchService {
-    /**
-     * Execute a git command synchronously.
-     * Uses cross-platform compatible options.
-     */
-    execGitSync(command, options) {
-        return (0, child_process_1.execSync)(command, {
-            cwd: options.cwd,
-            encoding: options.encoding || 'utf-8',
-            timeout: options.timeout || 10000,
-            shell: process.platform === 'win32' ? 'cmd.exe' : '/bin/sh',
-            stdio: ['pipe', 'pipe', 'pipe']
-        });
-    }
-    /**
-     * Execute a git command asynchronously via execAsync.
-     */
-    async execGitAsync(command, options) {
-        const { stdout } = await (0, exec_utils_1.execAsync)(command, {
-            cwd: options.cwd,
-            timeout: options.timeout || 30000,
-            shell: process.platform === 'win32' ? 'cmd.exe' : '/bin/sh',
-            env: {
-                ...process.env,
-                GIT_TERMINAL_PROMPT: '0',
-                ...options.env,
-            },
-        });
-        return stdout;
-    }
-    /**
-     * Get the current branch status.
-     * @param repoRoot Repository root path
-     * @param hasUncommittedChanges Whether there are uncommitted changes
-     */
-    getBranchStatus(repoRoot, hasUncommittedChanges) {
-        try {
-            const headHash = this.getHeadHash(repoRoot);
-            if (!headHash) {
-                return null;
-            }
-            const isDetached = this.isDetachedHead(repoRoot);
-            if (isDetached) {
-                return {
-                    name: '',
-                    isDetached: true,
-                    detachedHash: headHash,
-                    ahead: 0,
-                    behind: 0,
-                    hasUncommittedChanges
-                };
-            }
-            const branchName = this.getCurrentBranchName(repoRoot);
-            if (!branchName) {
-                return null;
-            }
-            const trackingInfo = this.getTrackingBranchInfo(repoRoot, branchName);
-            return {
-                name: branchName,
-                isDetached: false,
-                ahead: trackingInfo.ahead,
-                behind: trackingInfo.behind,
-                trackingBranch: trackingInfo.trackingBranch,
-                hasUncommittedChanges
-            };
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get branch status', error instanceof Error ? error : undefined);
-            return null;
-        }
-    }
-    /**
-     * Check if HEAD is detached.
-     */
-    isDetachedHead(repoRoot) {
-        try {
-            const output = this.execGitSync('git symbolic-ref -q HEAD', { cwd: repoRoot });
-            return !output.trim();
-        }
-        catch {
-            return true;
-        }
-    }
-    /**
-     * Get the HEAD commit hash.
-     */
-    getHeadHash(repoRoot) {
-        try {
-            return this.execGitSync('git rev-parse HEAD', { cwd: repoRoot }).trim();
-        }
-        catch {
-            return '';
-        }
-    }
-    /**
-     * Get the current branch name.
-     */
-    getCurrentBranchName(repoRoot) {
-        try {
-            const output = this.execGitSync('git rev-parse --abbrev-ref HEAD', { cwd: repoRoot });
-            const name = output.trim();
-            return name === 'HEAD' ? null : name;
-        }
-        catch {
-            return null;
-        }
-    }
-    /**
-     * Get tracking branch information (ahead/behind counts).
-     */
-    getTrackingBranchInfo(repoRoot, branchName) {
-        try {
-            const upstreamCmd = `git rev-parse --abbrev-ref "${branchName}@{upstream}"`;
-            let trackingBranch;
-            try {
-                trackingBranch = this.execGitSync(upstreamCmd, { cwd: repoRoot }).trim();
-            }
-            catch {
-                return { ahead: 0, behind: 0 };
-            }
-            const aheadCmd = `git rev-list --count "${trackingBranch}..${branchName}"`;
-            const behindCmd = `git rev-list --count "${branchName}..${trackingBranch}"`;
-            const ahead = parseInt(this.execGitSync(aheadCmd, { cwd: repoRoot }).trim(), 10) || 0;
-            const behind = parseInt(this.execGitSync(behindCmd, { cwd: repoRoot }).trim(), 10) || 0;
-            return { trackingBranch, ahead, behind };
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get tracking info', error instanceof Error ? error : undefined);
-            return { ahead: 0, behind: 0 };
-        }
-    }
-    /**
-     * Get all local branches.
-     */
-    getLocalBranches(repoRoot) {
-        try {
-            const format = '%(if)%(HEAD)%(then)*%(else) %(end)|%(refname:short)|%(subject)|%(committerdate:relative)';
-            const output = this.execGitSync(`git branch --format="${format}"`, { cwd: repoRoot });
-            if (!output.trim()) {
-                return [];
-            }
-            return output.trim().split('\n').map(line => {
-                const parts = line.split('|');
-                const isCurrent = parts[0] === '*';
-                return {
-                    name: parts[1] || '',
-                    isCurrent,
-                    isRemote: false,
-                    lastCommitSubject: parts[2] || '',
-                    lastCommitDate: parts[3] || ''
-                };
-            }).filter(b => b.name);
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get local branches', error instanceof Error ? error : undefined);
-            return [];
-        }
-    }
-    /**
-     * Get remote branches.
-     */
-    getRemoteBranches(repoRoot) {
-        try {
-            const format = '%(refname:short)|%(subject)|%(committerdate:relative)';
-            const output = this.execGitSync(`git branch -r --format="${format}"`, { cwd: repoRoot });
-            if (!output.trim()) {
-                return [];
-            }
-            return output.trim().split('\n')
-                .filter(line => !line.includes('HEAD'))
-                .map(line => {
-                const parts = line.split('|');
-                const fullName = parts[0] || '';
-                const slashIndex = fullName.indexOf('/');
-                const remoteName = slashIndex > 0 ? fullName.substring(0, slashIndex) : undefined;
-                return {
-                    name: fullName,
-                    isCurrent: false,
-                    isRemote: true,
-                    remoteName,
-                    lastCommitSubject: parts[1] || '',
-                    lastCommitDate: parts[2] || ''
-                };
-            }).filter(b => b.name);
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get remote branches', error instanceof Error ? error : undefined);
-            return [];
-        }
-    }
-    /**
-     * Get all branches (local and remote).
-     */
-    getAllBranches(repoRoot) {
-        return {
-            local: this.getLocalBranches(repoRoot),
-            remote: this.getRemoteBranches(repoRoot)
-        };
-    }
-    /**
-     * Get local branch count (fast operation).
-     */
-    getLocalBranchCount(repoRoot, searchPattern) {
-        try {
-            const command = 'git branch --list';
-            const output = this.execGitSync(command, { cwd: repoRoot });
-            if (!output.trim()) {
-                return 0;
-            }
-            let lines = output.trim().split('\n').filter(line => line.trim());
-            if (searchPattern) {
-                const lowerPattern = searchPattern.toLowerCase();
-                lines = lines.filter(line => {
-                    const branchName = line.substring(2).trim();
-                    return branchName.toLowerCase().includes(lowerPattern);
-                });
-            }
-            return lines.length;
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get local branch count', error instanceof Error ? error : undefined);
-            return 0;
-        }
-    }
-    /**
-     * Get remote branch count (fast operation).
-     */
-    getRemoteBranchCount(repoRoot, searchPattern) {
-        try {
-            const command = 'git branch -r --list';
-            const output = this.execGitSync(command, { cwd: repoRoot });
-            if (!output.trim()) {
-                return 0;
-            }
-            let lines = output.trim().split('\n').filter(line => line.trim() && !line.includes('HEAD'));
-            if (searchPattern) {
-                const lowerPattern = searchPattern.toLowerCase();
-                lines = lines.filter(line => {
-                    const branchName = line.trim();
-                    return branchName.toLowerCase().includes(lowerPattern);
-                });
-            }
-            return lines.length;
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get remote branch count', error instanceof Error ? error : undefined);
-            return 0;
-        }
-    }
-    /**
-     * Get local branches with pagination and search support.
-     */
-    getLocalBranchesPaginated(repoRoot, options = {}) {
-        const { limit = 100, offset = 0, searchPattern } = options;
-        try {
-            const totalCount = this.getLocalBranchCount(repoRoot, searchPattern);
-            if (totalCount === 0) {
-                return { branches: [], totalCount: 0, hasMore: false };
-            }
-            const format = '%(if)%(HEAD)%(then)*%(else) %(end)|%(refname:short)|%(subject)|%(committerdate:relative)';
-            let command = `git branch --format="${format}"`;
-            if (searchPattern) {
-                const escapedPattern = searchPattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-                if (process.platform === 'win32') {
-                    command += ` | findstr /i "${escapedPattern}"`;
-                }
-                else {
-                    command += ` | grep -i "${escapedPattern}"`;
-                }
-            }
-            if (process.platform !== 'win32') {
-                if (offset > 0) {
-                    command += ` | tail -n +${offset + 1}`;
-                }
-                command += ` | head -n ${limit}`;
-            }
-            const output = this.execGitSync(command, { cwd: repoRoot, timeout: 30000 });
-            if (!output.trim()) {
-                return { branches: [], totalCount, hasMore: offset + limit < totalCount };
-            }
-            let lines = output.trim().split('\n');
-            if (process.platform === 'win32') {
-                if (searchPattern) {
-                    const lowerPattern = searchPattern.toLowerCase();
-                    lines = lines.filter(line => {
-                        const parts = line.split('|');
-                        const branchName = parts[1] || '';
-                        return branchName.toLowerCase().includes(lowerPattern);
-                    });
-                }
-                lines = lines.slice(offset, offset + limit);
-            }
-            const branches = lines.map(line => {
-                const parts = line.split('|');
-                const isCurrent = parts[0] === '*';
-                return {
-                    name: parts[1] || '',
-                    isCurrent,
-                    isRemote: false,
-                    lastCommitSubject: parts[2] || '',
-                    lastCommitDate: parts[3] || ''
-                };
-            }).filter(b => b.name);
-            return {
-                branches,
-                totalCount,
-                hasMore: offset + branches.length < totalCount
-            };
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get paginated local branches', error instanceof Error ? error : undefined);
-            return { branches: [], totalCount: 0, hasMore: false };
-        }
-    }
-    /**
-     * Get remote branches with pagination and search support.
-     */
-    getRemoteBranchesPaginated(repoRoot, options = {}) {
-        const { limit = 100, offset = 0, searchPattern } = options;
-        try {
-            const totalCount = this.getRemoteBranchCount(repoRoot, searchPattern);
-            if (totalCount === 0) {
-                return { branches: [], totalCount: 0, hasMore: false };
-            }
-            const format = '%(refname:short)|%(subject)|%(committerdate:relative)';
-            let command = `git branch -r --format="${format}"`;
-            if (process.platform === 'win32') {
-                command += ' | findstr /v "HEAD"';
-                if (searchPattern) {
-                    const escapedPattern = searchPattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-                    command += ` | findstr /i "${escapedPattern}"`;
-                }
-            }
-            else {
-                command += ' | grep -v "HEAD"';
-                if (searchPattern) {
-                    const escapedPattern = searchPattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-                    command += ` | grep -i "${escapedPattern}"`;
-                }
-                if (offset > 0) {
-                    command += ` | tail -n +${offset + 1}`;
-                }
-                command += ` | head -n ${limit}`;
-            }
-            const output = this.execGitSync(command, { cwd: repoRoot, timeout: 30000 });
-            if (!output.trim()) {
-                return { branches: [], totalCount, hasMore: offset + limit < totalCount };
-            }
-            let lines = output.trim().split('\n').filter(line => !line.includes('HEAD'));
-            if (process.platform === 'win32') {
-                if (searchPattern) {
-                    const lowerPattern = searchPattern.toLowerCase();
-                    lines = lines.filter(line => {
-                        const parts = line.split('|');
-                        const branchName = parts[0] || '';
-                        return branchName.toLowerCase().includes(lowerPattern);
-                    });
-                }
-                lines = lines.slice(offset, offset + limit);
-            }
-            const branches = lines.map(line => {
-                const parts = line.split('|');
-                const fullName = parts[0] || '';
-                const slashIndex = fullName.indexOf('/');
-                const remoteName = slashIndex > 0 ? fullName.substring(0, slashIndex) : undefined;
-                return {
-                    name: fullName,
-                    isCurrent: false,
-                    isRemote: true,
-                    remoteName,
-                    lastCommitSubject: parts[1] || '',
-                    lastCommitDate: parts[2] || ''
-                };
-            }).filter(b => b.name);
-            return {
-                branches,
-                totalCount,
-                hasMore: offset + branches.length < totalCount
-            };
-        }
-        catch (error) {
-            (0, logger_1.getLogger)().error('Git', 'Failed to get paginated remote branches', error instanceof Error ? error : undefined);
-            return { branches: [], totalCount: 0, hasMore: false };
-        }
-    }
-    /**
-     * Search branches by name (combines local and remote).
-     */
-    searchBranches(repoRoot, searchPattern, limit = 50) {
-        const localResult = this.getLocalBranchesPaginated(repoRoot, { searchPattern, limit });
-        const remoteResult = this.getRemoteBranchesPaginated(repoRoot, { searchPattern, limit });
-        return {
-            local: localResult.branches,
-            remote: remoteResult.branches
-        };
-    }
-    /**
-     * Switch to a branch.
-     */
-    async switchBranch(repoRoot, branchName, options) {
-        try {
-            let command = 'git checkout';
-            if (options?.create) {
-                command += ' -b';
-            }
-            if (options?.force) {
-                command += ' -f';
-            }
-            command += ` "${branchName}"`;
-            await this.execGitAsync(command, { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', `Failed to switch to branch ${branchName}`, error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Create a new branch from the current HEAD.
-     */
-    async createBranch(repoRoot, branchName, checkout = true) {
-        try {
-            if (checkout) {
-                await this.execGitAsync(`git checkout -b "${branchName}"`, { cwd: repoRoot });
-            }
-            else {
-                await this.execGitAsync(`git branch "${branchName}"`, { cwd: repoRoot });
-            }
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', `Failed to create branch ${branchName}`, error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Delete a branch.
-     */
-    async deleteBranch(repoRoot, branchName, force = false) {
-        try {
-            const flag = force ? '-D' : '-d';
-            await this.execGitAsync(`git branch ${flag} "${branchName}"`, { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', `Failed to delete branch ${branchName}`, error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Rename a branch.
-     */
-    async renameBranch(repoRoot, oldName, newName) {
-        try {
-            await this.execGitAsync(`git branch -m "${oldName}" "${newName}"`, { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', `Failed to rename branch ${oldName} to ${newName}`, error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Merge a branch into the current branch.
-     */
-    async mergeBranch(repoRoot, branchName) {
-        try {
-            await this.execGitAsync(`git merge "${branchName}"`, { cwd: repoRoot, timeout: 600000 });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', `Failed to merge branch ${branchName}`, error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Push to remote.
-     */
-    async push(repoRoot, setUpstream = false) {
-        try {
-            let cmd = 'git push';
-            if (setUpstream) {
-                const branchName = this.getCurrentBranchName(repoRoot);
-                if (branchName) {
-                    cmd = `git push -u origin "${branchName}"`;
-                }
-            }
-            await this.execGitAsync(cmd, { cwd: repoRoot, timeout: 600000 });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to push', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Pull from remote.
-     */
-    async pull(repoRoot, rebase = false) {
-        try {
-            const cmd = rebase ? 'git pull --rebase' : 'git pull';
-            await this.execGitAsync(cmd, { cwd: repoRoot, timeout: 600000 });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to pull', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Run a non-interactive git rebase --autosquash against the upstream branch.
-     * GIT_SEQUENCE_EDITOR is set to a no-op so git accepts the pre-generated
-     * todo list immediately without opening an editor.
-     */
-    async rebaseAutosquash(repoRoot) {
-        try {
-            const seqEditor = process.platform === 'win32' ? 'true' : ':';
-            await this.execGitAsync('git rebase -i --autosquash @{upstream}', {
-                cwd: repoRoot,
-                timeout: 600000,
-                env: { GIT_SEQUENCE_EDITOR: seqEditor },
-            });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to rebase --autosquash', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Fetch from remote.
-     */
-    async fetch(repoRoot, remote) {
-        try {
-            const cmd = remote ? `git fetch "${remote}"` : 'git fetch --all';
-            await this.execGitAsync(cmd, { cwd: repoRoot, timeout: 600000 });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to fetch', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Stash changes.
-     */
-    async stashChanges(repoRoot, message) {
-        try {
-            const cmd = message
-                ? `git stash push -m "${message.replace(/"/g, '\\"')}"`
-                : 'git stash push';
-            await this.execGitAsync(cmd, { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to stash changes', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Cherry-pick a commit onto the current branch.
-     * @returns success: true on clean apply, conflicts: true when merge conflicts occur
-     */
-    async cherryPick(repoRoot, hash) {
-        try {
-            await this.execGitAsync(`git cherry-pick ${hash}`, { cwd: repoRoot });
-            return { success: true, conflicts: false, message: 'Cherry-pick applied successfully' };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            const isConflict = /CONFLICT|conflict/i.test(errorMessage) || /cherry-pick.*conflict/i.test(errorMessage) || /Merge conflict/i.test(errorMessage);
-            if (isConflict) {
-                return { success: false, conflicts: true, message: errorMessage };
-            }
-            (0, logger_1.getLogger)().error('Git', `Failed to cherry-pick ${hash}`, error instanceof Error ? error : undefined);
-            return { success: false, conflicts: false, message: errorMessage };
-        }
-    }
-    /**
-     * Pop the most recent stash.
-     */
-    async popStash(repoRoot) {
-        try {
-            await this.execGitAsync('git stash pop', { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to pop stash', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Amend the HEAD commit message (title + optional body).
-     * Runs `git commit --amend --no-edit` variant that only changes the message.
-     * Returns the new HEAD hash on success.
-     */
-    async amendCommitMessage(repoRoot, title, body) {
-        if (!title || !title.trim()) {
-            return { success: false, error: 'Commit title must not be empty' };
-        }
-        const message = body ? `${title}\n\n${body}` : title;
-        const escaped = message.replace(/"/g, '\\"');
-        try {
-            await this.execGitAsync(`git commit --amend --only -m "${escaped}"`, { cwd: repoRoot });
-            const hash = this.execGitSync('git rev-parse HEAD', { cwd: repoRoot }).trim();
-            return { success: true, hash };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to amend commit message', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Check if there are uncommitted changes (staged or unstaged).
-     */
-    hasUncommittedChanges(repoRoot) {
-        try {
-            const output = this.execGitSync('git status --porcelain', { cwd: repoRoot });
-            return output.trim().length > 0;
-        }
-        catch {
-            return false;
-        }
-    }
-    /**
-     * Detect the current repository state (merge/rebase/cherry-pick in progress).
-     * Checks git sentinel files to determine the active operation.
-     */
-    getRepoState(repoRoot) {
-        try {
-            // Resolve .git dir (handles worktrees where .git is a file pointing elsewhere)
-            const gitDir = this.execGitSync('git rev-parse --git-dir', { cwd: repoRoot }).trim();
-            const resolvedGitDir = path.isAbsolute(gitDir) ? gitDir : path.join(repoRoot, gitDir);
-            let operation = 'none';
-            if (fs.existsSync(path.join(resolvedGitDir, 'rebase-merge')) ||
-                fs.existsSync(path.join(resolvedGitDir, 'rebase-apply'))) {
-                operation = 'rebase';
-            }
-            else if (fs.existsSync(path.join(resolvedGitDir, 'MERGE_HEAD'))) {
-                operation = 'merge';
-            }
-            else if (fs.existsSync(path.join(resolvedGitDir, 'CHERRY_PICK_HEAD'))) {
-                operation = 'cherry-pick';
-            }
-            let conflictFiles = [];
-            if (operation !== 'none') {
-                try {
-                    const output = this.execGitSync('git diff --name-only --diff-filter=U', { cwd: repoRoot });
-                    conflictFiles = output.trim().split('\n').filter(Boolean);
-                }
-                catch {
-                    // Ignore — no conflicts
-                }
-            }
-            return { operation, conflictFiles };
-        }
-        catch {
-            return { operation: 'none', conflictFiles: [] };
-        }
-    }
-    /**
-     * Continue an in-progress rebase.
-     */
-    async rebaseContinue(repoRoot) {
-        try {
-            await this.execGitAsync('git rebase --continue', {
-                cwd: repoRoot,
-                timeout: 600000,
-                env: { GIT_EDITOR: 'true' },
-            });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to continue rebase', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Abort an in-progress rebase.
-     */
-    async rebaseAbort(repoRoot) {
-        try {
-            await this.execGitAsync('git rebase --abort', { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to abort rebase', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Continue an in-progress merge (commits the merge).
-     */
-    async mergeContinue(repoRoot) {
-        try {
-            await this.execGitAsync('git merge --continue', {
-                cwd: repoRoot,
-                timeout: 600000,
-                env: { GIT_EDITOR: 'true' },
-            });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to continue merge', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Abort an in-progress merge.
-     */
-    async mergeAbort(repoRoot) {
-        try {
-            await this.execGitAsync('git merge --abort', { cwd: repoRoot });
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to abort merge', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Reorder unpushed commits via non-interactive rebase.
-     * @param repoRoot Repository root path
-     * @param commitOrder Array of commit hashes in desired new order (oldest first)
-     */
-    async rebaseReorder(repoRoot, commitOrder) {
-        if (!commitOrder.length) {
-            return { success: false, error: 'No commits to reorder' };
-        }
-        try {
-            // Build the todo list for the rebase
-            const todoContent = commitOrder.map(hash => `pick ${hash}`).join('\n') + '\n';
-            const tmpDir = fs.mkdtempSync(path.join(repoRoot, '.git', 'tmp-reorder-'));
-            const todoPath = path.join(tmpDir, 'todo');
-            fs.writeFileSync(todoPath, todoContent, 'utf-8');
-            // Create a script that replaces the rebase todo with our custom order
-            let seqEditor;
-            if (process.platform === 'win32') {
-                const scriptPath = path.join(tmpDir, 'editor.cmd');
-                // On Windows, write a batch script that copies our todo file over the rebase todo
-                fs.writeFileSync(scriptPath, `@copy /Y "${todoPath.replace(/\\/g, '\\\\')}" %1 >nul\n`, 'utf-8');
-                seqEditor = scriptPath;
-            }
-            else {
-                const scriptPath = path.join(tmpDir, 'editor.sh');
-                fs.writeFileSync(scriptPath, `#!/bin/sh\ncp "${todoPath}" "$1"\n`, { mode: 0o755 });
-                seqEditor = scriptPath;
-            }
-            // Find the base commit (parent of the oldest commit in the order)
-            const baseHash = this.execGitSync(`git rev-parse ${commitOrder[0]}~1`, { cwd: repoRoot }).trim();
-            await this.execGitAsync(`git rebase -i ${baseHash}`, {
-                cwd: repoRoot,
-                timeout: 600000,
-                env: { GIT_SEQUENCE_EDITOR: seqEditor },
-            });
-            // Clean up temp files
-            try {
-                fs.rmSync(tmpDir, { recursive: true });
-            }
-            catch { /* best effort */ }
-            return { success: true };
-        }
-        catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            (0, logger_1.getLogger)().error('Git', 'Failed to reorder commits', error instanceof Error ? error : undefined);
-            return { success: false, error: errorMessage };
-        }
-    }
-    /**
-     * Dispose of resources (no-op, provided for Disposable interface compatibility).
-     */
-    dispose() {
-        // No resources to clean up
-    }
-}
-exports.BranchService = BranchService;
-//# sourceMappingURL=branch-service.js.map