axon-code 2.4.0

package/dist/web/server/git-manager.js

@@ -0,0 +1,1556 @@
+/**
+ * Git 管理器
+ * 封装所有 git 命令操作
+ */
+import { execSync, execFileSync, exec } from 'child_process';
+import { promisify } from 'util';
+const execAsync = promisify(exec);
+import { existsSync, unlinkSync, statSync } from 'fs';
+import { join } from 'path';
+/**
+ * Git Manager 类
+ */
+export class GitManager {
+    cwd;
+    timeout = 10000; // 10秒超时（本地操作）
+    networkTimeout = 60000; // 60秒超时（网络操作：push/pull/fetch）
+    constructor(cwd) {
+        this.cwd = cwd;
+    }
+    /**
+     * 对网络操作的错误进行分类
+     */
+    classifyNetworkError(msg) {
+        const lower = msg.toLowerCase();
+        // 认证失败
+        if (lower.includes('authentication failed') || lower.includes('could not read username') ||
+            lower.includes('invalid credentials') || lower.includes('authorization failed') ||
+            lower.includes('permission denied') || lower.includes('403')) {
+            return { errorType: 'auth', friendlyMsg: 'Authentication failed. Check your git credentials or access token.' };
+        }
+        // 推送被拒绝（远程有新提交）
+        if (lower.includes('rejected') || lower.includes('non-fast-forward') || lower.includes('fetch first')) {
+            return { errorType: 'rejected', friendlyMsg: 'Push rejected: remote has newer commits. Pull first, then push again.' };
+        }
+        // 超时
+        if (lower.includes('timed out') || lower.includes('timeout')) {
+            return { errorType: 'timeout', friendlyMsg: 'Network timeout. Check your internet connection or proxy settings.' };
+        }
+        // 网络不通
+        if (lower.includes('could not resolve host') || lower.includes('unable to access') ||
+            lower.includes('failed to connect') || lower.includes('network is unreachable') ||
+            lower.includes('connection refused') || lower.includes('ssl')) {
+            return { errorType: 'network', friendlyMsg: 'Network error. Check your internet connection or proxy settings.' };
+        }
+        return { errorType: 'unknown', friendlyMsg: msg };
+    }
+    /**
+     * 检测 .git/index.lock 是否存在并返回诊断信息
+     */
+    checkLockFile() {
+        const lockFile = join(this.cwd, '.git', 'index.lock');
+        if (!existsSync(lockFile)) {
+            return { exists: false, lockFile, age: 0, suggestion: 'delete' };
+        }
+        try {
+            const stat = statSync(lockFile);
+            const age = Math.floor((Date.now() - stat.mtimeMs) / 1000);
+            // 如果 lock 文件超过 5 秒，大概率是残留文件，建议删除
+            // 如果不到 5 秒，可能有正在执行的 git 操作
+            return { exists: true, lockFile, age, suggestion: age > 5 ? 'delete' : 'wait' };
+        }
+        catch {
+            return { exists: false, lockFile, age: 0, suggestion: 'delete' };
+        }
+    }
+    /**
+     * 删除 .git/index.lock 文件
+     */
+    removeLockFile() {
+        const lockFile = join(this.cwd, '.git', 'index.lock');
+        if (!existsSync(lockFile)) {
+            return { success: true };
+        }
+        try {
+            unlinkSync(lockFile);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 检查错误是否为 index.lock 冲突
+     */
+    isLockError(errorMsg) {
+        return errorMsg.includes('index.lock') || errorMsg.includes('.git/index.lock');
+    }
+    /**
+     * 当 git 操作因 lock 失败时，返回包含 lockConflict 信息的 GitResult
+     */
+    buildLockErrorResult(errorMsg) {
+        const lockInfo = this.checkLockFile();
+        return {
+            success: false,
+            error: errorMsg,
+            lockConflict: lockInfo.exists ? {
+                lockFile: lockInfo.lockFile,
+                age: lockInfo.age,
+                suggestion: lockInfo.suggestion,
+            } : undefined,
+        };
+    }
+    /**
+     * 执行 git 命令（内部方法）
+     */
+    execGit(command) {
+        try {
+            return execSync(`git ${command}`, {
+                cwd: this.cwd,
+                encoding: 'utf-8',
+                timeout: this.timeout,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            }).trimEnd();
+        }
+        catch (error) {
+            // 捕获 stderr 并抛出
+            const stderr = error.stderr?.toString() || error.message || String(error);
+            throw new Error(stderr);
+        }
+    }
+    /**
+     * 异步执行 git 命令（用于网络操作，避免阻塞事件循环）
+     * 设置 GIT_TERMINAL_PROMPT=0 和 GCM_INTERACTIVE=never 防止认证弹窗导致进程挂起
+     */
+    async execGitNetwork(command) {
+        try {
+            const { stdout, stderr } = await execAsync(`git ${command}`, {
+                cwd: this.cwd,
+                encoding: 'utf-8',
+                timeout: this.networkTimeout,
+                env: {
+                    ...process.env,
+                    GIT_TERMINAL_PROMPT: '0',
+                    GCM_INTERACTIVE: 'never',
+                },
+            });
+            return (stdout || '').trim();
+        }
+        catch (error) {
+            const stderr = error.stderr?.toString() || error.message || String(error);
+            throw new Error(stderr);
+        }
+    }
+    /**
+     * 获取完整 git 状态
+     */
+    getStatus() {
+        try {
+            // 获取当前分支
+            const currentBranch = this.execGit('branch --show-current');
+            // 获取状态（短格式，-uall 展开未跟踪目录中的文件，与 VS Code 一致）
+            const statusOutput = this.execGit('status --porcelain -uall');
+            const staged = [];
+            const unstaged = [];
+            const untracked = [];
+            const conflicts = [];
+            // 解析 status 输出
+            // 每个文件以 "状态标记 文件名" 格式存储（如 "M src/foo.ts"、"D bar.ts"）
+            // 前端用第一个字符判断状态标记，用 substring(2) 获取文件名
+            statusOutput.split('\n').forEach(line => {
+                if (!line)
+                    return;
+                const x = line[0]; // index 状态
+                const y = line[1]; // working tree 状态
+                const file = line.substring(3);
+                // 冲突文件
+                if (x === 'U' || y === 'U' || (x === 'A' && y === 'A') || (x === 'D' && y === 'D')) {
+                    conflicts.push(file);
+                }
+                // 暂存区文件（带状态前缀）
+                else if (x !== ' ' && x !== '?') {
+                    staged.push(`${x} ${file}`);
+                }
+                // 未暂存修改文件（带状态前缀）
+                if (y === 'M' || y === 'D') {
+                    unstaged.push(`${y} ${file}`);
+                }
+                // 未跟踪文件（不带前缀，前端统一标记为 U）
+                if (x === '?' && y === '?') {
+                    untracked.push(file);
+                }
+            });
+            // 获取最近5条 commit
+            const recentCommits = this.getLog(5).data || [];
+            // 获取 stash 数量
+            let stashCount = 0;
+            try {
+                const stashList = this.execGit('stash list');
+                stashCount = stashList ? stashList.split('\n').length : 0;
+            }
+            catch {
+                stashCount = 0;
+            }
+            // 获取远程状态
+            let remoteStatus = {
+                ahead: 0,
+                behind: 0,
+                remote: undefined,
+                branch: undefined,
+            };
+            try {
+                const remoteBranch = this.execGit('rev-parse --abbrev-ref @{upstream}');
+                const [remote, branch] = remoteBranch.split('/');
+                remoteStatus.remote = remote;
+                remoteStatus.branch = branch;
+                // 获取 ahead/behind
+                const revList = this.execGit(`rev-list --left-right --count ${remoteBranch}...HEAD`);
+                const [behind, ahead] = revList.split('\t').map(Number);
+                remoteStatus.ahead = ahead || 0;
+                remoteStatus.behind = behind || 0;
+            }
+            catch {
+                // 没有远程分支或无法获取，使用默认值
+            }
+            // 获取 tags
+            let tags = [];
+            try {
+                const tagsOutput = this.execGit('tag --points-at HEAD');
+                tags = tagsOutput ? tagsOutput.split('\n') : [];
+            }
+            catch {
+                tags = [];
+            }
+            return {
+                success: true,
+                data: {
+                    staged,
+                    unstaged,
+                    untracked,
+                    conflicts,
+                    recentCommits,
+                    stashCount,
+                    remoteStatus,
+                    tags,
+                    currentBranch,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取 commit 历史
+     */
+    getLog(limit = 50, options) {
+        try {
+            // 格式：hash, parents, shortHash, author, date, message, refs
+            const format = '%H%n%P%n%h%n%an%n%ai%n%s%n%D%n--END--';
+            let cmd = `log -${limit} --format="${format}"`;
+            if (options?.all)
+                cmd += ' --all';
+            if (options?.branch)
+                cmd += ` "${options.branch}"`;
+            const output = this.execGit(cmd);
+            const commits = [];
+            const entries = output.split('--END--\n').filter(e => e.trim());
+            for (const entry of entries) {
+                const lines = entry.trim().split('\n');
+                if (lines.length >= 7) {
+                    // 解析 parents（空格分隔的 hash 列表）
+                    const parents = lines[1].trim() ? lines[1].trim().split(' ') : [];
+                    // 解析 refs（逗号分隔，可能为空）
+                    const refsStr = lines[6].trim();
+                    const refs = refsStr ? refsStr.split(',').map(r => r.trim()) : [];
+                    commits.push({
+                        hash: lines[0],
+                        shortHash: lines[2],
+                        author: lines[3],
+                        date: lines[4],
+                        message: lines[5],
+                        parents,
+                        refs,
+                    });
+                }
+            }
+            return {
+                success: true,
+                data: commits,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取分支列表
+     */
+    getBranches() {
+        try {
+            // 使用 git branch -a 获取所有分支（兼容 Windows，避免 --format 中 % 被 cmd.exe 解析）
+            const output = this.execGit('branch -a');
+            const branches = [];
+            for (const line of output.split('\n')) {
+                if (!line.trim())
+                    continue;
+                const isCurrent = line.startsWith('*');
+                let name = line.replace(/^\*?\s+/, '').trim();
+                // 跳过 HEAD -> 指针
+                if (name.includes('->'))
+                    continue;
+                // 判断是否为远程分支
+                const isRemote = name.startsWith('remotes/');
+                if (isRemote) {
+                    name = name.replace(/^remotes\//, '');
+                }
+                branches.push({
+                    name,
+                    current: isCurrent,
+                    remote: isRemote,
+                });
+            }
+            return {
+                success: true,
+                data: branches,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取 stash 列表
+     */
+    getStashes() {
+        try {
+            // 使用 git stash list 默认格式（兼容 Windows，避免 --format 中 % 被 cmd.exe 解析）
+            // 默认格式: stash@{0}: WIP on branch: hash message
+            const output = this.execGit('stash list');
+            if (!output) {
+                return {
+                    success: true,
+                    data: [],
+                };
+            }
+            const stashes = output.split('\n').filter(Boolean).map(line => {
+                // 解析默认格式: "stash@{0}: On branch: message" 或 "stash@{0}: WIP on branch: hash message"
+                const indexMatch = line.match(/stash@\{(\d+)\}/);
+                const index = indexMatch ? parseInt(indexMatch[1]) : 0;
+                // 提取冒号后面的消息部分
+                const colonIndex = line.indexOf(':');
+                const message = colonIndex >= 0 ? line.substring(colonIndex + 1).trim() : line;
+                return {
+                    index,
+                    message,
+                    date: '', // 默认格式不含日期，留空
+                };
+            });
+            return {
+                success: true,
+                data: stashes,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 暂存文件
+     */
+    stage(files) {
+        try {
+            if (files.length === 0) {
+                return {
+                    success: false,
+                    error: 'No files specified to stage',
+                };
+            }
+            // 使用 -- 分隔符确保文件名安全
+            const fileArgs = files.map(f => `"${f}"`).join(' ');
+            this.execGit(`add -- ${fileArgs}`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            if (this.isLockError(msg)) {
+                return this.buildLockErrorResult(msg);
+            }
+            return { success: false, error: msg };
+        }
+    }
+    /**
+     * 暂存所有文件（包括新文件和修改）
+     */
+    stageAll() {
+        try {
+            this.execGit('add -A');
+            return { success: true };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            if (this.isLockError(msg)) {
+                return this.buildLockErrorResult(msg);
+            }
+            return { success: false, error: msg };
+        }
+    }
+    /**
+     * 取消暂存
+     */
+    unstage(files) {
+        try {
+            if (files.length === 0) {
+                return {
+                    success: false,
+                    error: 'No files specified to unstage',
+                };
+            }
+            const fileArgs = files.map(f => `"${f}"`).join(' ');
+            this.execGit(`reset HEAD -- ${fileArgs}`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            if (this.isLockError(msg)) {
+                return this.buildLockErrorResult(msg);
+            }
+            return { success: false, error: msg };
+        }
+    }
+    /**
+     * 提交
+     */
+    commit(message) {
+        try {
+            if (!message || !message.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit message cannot be empty',
+                };
+            }
+            // 通过 stdin 传递 commit message（-F -），彻底避免 Windows 命令行对括号、!、& 等特殊字符的转义问题
+            execFileSync('git', ['commit', '-F', '-'], {
+                cwd: this.cwd,
+                encoding: 'utf-8',
+                timeout: this.timeout,
+                input: message,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            const stderr = error.stderr || '';
+            const msg = stderr || error.message || String(error);
+            if (this.isLockError(msg)) {
+                return this.buildLockErrorResult(msg);
+            }
+            return { success: false, error: msg };
+        }
+    }
+    /**
+     * 推送（异步，60秒超时）
+     */
+    async push() {
+        try {
+            await this.execGitNetwork('push origin HEAD');
+            return { success: true };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            const { errorType, friendlyMsg } = this.classifyNetworkError(msg);
+            return { success: false, error: friendlyMsg, errorType };
+        }
+    }
+    /**
+     * 拉取（异步，60秒超时）
+     */
+    async pull() {
+        try {
+            await this.execGitNetwork('pull');
+            return { success: true };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            const { errorType, friendlyMsg } = this.classifyNetworkError(msg);
+            return { success: false, error: friendlyMsg, errorType };
+        }
+    }
+    /**
+     * 切换分支
+     */
+    checkout(branch) {
+        try {
+            if (!branch || !branch.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            this.execGit(`checkout "${branch}"`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 强制切换分支（丢弃本地更改）
+     */
+    forceCheckout(branch) {
+        try {
+            if (!branch || !branch.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            this.execGit(`checkout -f "${branch}"`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 创建分支
+     */
+    createBranch(name, startPoint) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            const cmd = startPoint
+                ? `branch "${name}" "${startPoint}"`
+                : `branch "${name}"`;
+            this.execGit(cmd);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 删除分支
+     */
+    deleteBranch(name) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            this.execGit(`branch -d "${name}"`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * Stash save
+     */
+    stashSave(message) {
+        try {
+            const cmd = message ? `stash push -m "${message.replace(/"/g, '\\"')}"` : 'stash push';
+            this.execGit(cmd);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * Stash pop
+     */
+    stashPop(index = 0) {
+        try {
+            this.execGit(`stash pop stash@{${index}}`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * Stash drop
+     */
+    stashDrop(index) {
+        try {
+            this.execGit(`stash drop stash@{${index}}`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * Stash apply
+     */
+    stashApply(index) {
+        try {
+            this.execGit(`stash apply stash@{${index}}`);
+            return {
+                success: true,
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取 diff
+     */
+    getDiff(file) {
+        try {
+            const cmd = file ? `diff "${file}"` : 'diff';
+            const content = this.execGit(cmd);
+            return {
+                success: true,
+                data: {
+                    file,
+                    content,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取单个 commit 详情
+     */
+    getCommitDetail(hash) {
+        try {
+            if (!hash || !hash.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit hash cannot be empty',
+                };
+            }
+            // 获取 commit 信息（包含 parents 和 refs）
+            const format = '%H%n%P%n%h%n%an%n%ai%n%s%n%D';
+            const infoOutput = this.execGit(`show -s --format="${format}" "${hash}"`);
+            const lines = infoOutput.split('\n');
+            if (lines.length < 7) {
+                return {
+                    success: false,
+                    error: 'Failed to get commit info',
+                };
+            }
+            // 解析 parents 和 refs
+            const parents = lines[1].trim() ? lines[1].trim().split(' ') : [];
+            const refsStr = lines[6].trim();
+            const refs = refsStr ? refsStr.split(',').map(r => r.trim()) : [];
+            // 获取 diff
+            const diff = this.execGit(`show "${hash}"`);
+            return {
+                success: true,
+                data: {
+                    hash: lines[0],
+                    shortHash: lines[2],
+                    author: lines[3],
+                    date: lines[4],
+                    message: lines[5],
+                    parents,
+                    refs,
+                    diff,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取 commit 涉及的文件列表（带状态）
+     */
+    getCommitFiles(hash) {
+        try {
+            if (!hash || !hash.trim()) {
+                return { success: false, error: 'Commit hash cannot be empty' };
+            }
+            const output = this.execGit(`diff-tree --no-commit-id --name-status -r "${hash}"`);
+            const files = output.split('\n').filter(Boolean).map(line => {
+                const parts = line.split('\t');
+                return { status: parts[0] || '?', file: parts.slice(1).join('\t') };
+            });
+            return { success: true, data: { files } };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 获取某个 commit 中特定文件的 diff
+     */
+    getCommitFileDiff(hash, file) {
+        try {
+            if (!hash || !hash.trim()) {
+                return { success: false, error: 'Commit hash cannot be empty' };
+            }
+            if (!file || !file.trim()) {
+                return { success: false, error: 'File path cannot be empty' };
+            }
+            const output = this.execGit(`diff "${hash}~1" "${hash}" -- "${file}"`);
+            return { success: true, data: { content: output, file } };
+        }
+        catch (error) {
+            // 对于首次 commit（没有 parent），使用 diff-tree
+            try {
+                const output = this.execGit(`show "${hash}" -- "${file}"`);
+                return { success: true, data: { content: output, file } };
+            }
+            catch {
+                return { success: false, error: error.message || String(error) };
+            }
+        }
+    }
+    /**
+     * ========== Git Enhanced Features - Core Workflow ==========
+     */
+    /**
+     * Merge 分支合并
+     */
+    merge(branch, strategy) {
+        try {
+            if (!branch || !branch.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            let cmd = `merge "${branch}"`;
+            if (strategy === 'no-ff') {
+                cmd = `merge --no-ff "${branch}"`;
+            }
+            else if (strategy === 'squash') {
+                cmd = `merge --squash "${branch}"`;
+            }
+            else if (strategy === 'ff-only') {
+                cmd = `merge --ff-only "${branch}"`;
+            }
+            this.execGit(cmd);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Rebase 变基
+     */
+    rebase(branch, onto) {
+        try {
+            if (!branch || !branch.trim()) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            let cmd = `rebase "${branch}"`;
+            if (onto) {
+                cmd = `rebase --onto "${onto}" "${branch}"`;
+            }
+            this.execGit(cmd);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Merge 中止
+     */
+    mergeAbort() {
+        try {
+            this.execGit('merge --abort');
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Rebase 继续
+     */
+    rebaseContinue() {
+        try {
+            this.execGit('rebase --continue');
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Rebase 中止
+     */
+    rebaseAbort() {
+        try {
+            this.execGit('rebase --abort');
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Reset 操作
+     */
+    reset(commit, mode) {
+        try {
+            if (!commit || !commit.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit hash cannot be empty',
+                };
+            }
+            this.execGit(`reset --${mode} "${commit}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Discard 单个文件的更改
+     */
+    discardFile(file) {
+        try {
+            if (!file || !file.trim()) {
+                return {
+                    success: false,
+                    error: 'Filename cannot be empty',
+                };
+            }
+            // 使用 checkout -- 丢弃工作区更改
+            this.execGit(`checkout -- "${file}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Discard 所有更改
+     */
+    discardAll() {
+        try {
+            // 丢弃所有工作区和暂存区的更改
+            this.execGit('reset --hard HEAD');
+            // 清理未跟踪的文件
+            this.execGit('clean -fd');
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Unstage 所有文件
+     */
+    unstageAll() {
+        try {
+            this.execGit('reset HEAD');
+            return { success: true };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            if (this.isLockError(msg)) {
+                return this.buildLockErrorResult(msg);
+            }
+            return { success: false, error: msg };
+        }
+    }
+    /**
+     * Amend 修改上次提交
+     */
+    amendCommit(message) {
+        try {
+            if (!message || !message.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit message cannot be empty',
+                };
+            }
+            // 通过 stdin 传递 commit message
+            execFileSync('git', ['commit', '--amend', '-F', '-'], {
+                cwd: this.cwd,
+                encoding: 'utf-8',
+                timeout: this.timeout,
+                input: message,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return { success: true };
+        }
+        catch (error) {
+            const stderr = error.stderr || '';
+            return {
+                success: false,
+                error: stderr || error.message || String(error),
+            };
+        }
+    }
+    /**
+     * Revert 撤销某个提交
+     */
+    revertCommit(hash) {
+        try {
+            if (!hash || !hash.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit hash cannot be empty',
+                };
+            }
+            this.execGit(`revert --no-edit "${hash}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Cherry-pick 挑选提交
+     */
+    cherryPick(hash) {
+        try {
+            if (!hash || !hash.trim()) {
+                return {
+                    success: false,
+                    error: 'Commit hash cannot be empty',
+                };
+            }
+            this.execGit(`cherry-pick "${hash}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 获取冲突文件内容
+     */
+    getConflicts(file) {
+        try {
+            if (!file || !file.trim()) {
+                return {
+                    success: false,
+                    error: 'Filename cannot be empty',
+                };
+            }
+            // 获取 ours (当前分支版本)
+            let ours = '';
+            try {
+                ours = this.execGit(`show :2:"${file}"`);
+            }
+            catch {
+                ours = '';
+            }
+            // 获取 theirs (合并分支版本)
+            let theirs = '';
+            try {
+                theirs = this.execGit(`show :3:"${file}"`);
+            }
+            catch {
+                theirs = '';
+            }
+            // 获取 base (共同祖先版本)
+            let base = '';
+            try {
+                base = this.execGit(`show :1:"${file}"`);
+            }
+            catch {
+                base = '';
+            }
+            return {
+                success: true,
+                data: {
+                    file,
+                    ours,
+                    theirs,
+                    base,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取 Merge/Rebase 状态
+     */
+    getMergeStatus() {
+        try {
+            // 检查是否在 merge/rebase 中
+            let inProgress = false;
+            let type = null;
+            // 检查 .git 目录中的标记文件
+            const fs = require('fs');
+            const path = require('path');
+            if (fs.existsSync(path.join(this.cwd, '.git', 'MERGE_HEAD'))) {
+                inProgress = true;
+                type = 'merge';
+            }
+            else if (fs.existsSync(path.join(this.cwd, '.git', 'rebase-merge')) ||
+                fs.existsSync(path.join(this.cwd, '.git', 'rebase-apply'))) {
+                inProgress = true;
+                type = 'rebase';
+            }
+            else if (fs.existsSync(path.join(this.cwd, '.git', 'CHERRY_PICK_HEAD'))) {
+                inProgress = true;
+                type = 'cherry-pick';
+            }
+            // 获取冲突文件列表
+            const conflicts = [];
+            if (inProgress) {
+                const statusOutput = this.execGit('status --porcelain');
+                statusOutput.split('\n').forEach(line => {
+                    if (!line)
+                        return;
+                    const x = line[0];
+                    const y = line[1];
+                    const file = line.substring(3);
+                    // 冲突标记
+                    if (x === 'U' || y === 'U' || (x === 'A' && y === 'A') || (x === 'D' && y === 'D')) {
+                        conflicts.push(file);
+                    }
+                });
+            }
+            return {
+                success: true,
+                data: {
+                    inProgress,
+                    type,
+                    conflicts,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * ========== Git Enhanced Features - Query & Analysis ==========
+     */
+    /**
+     * 搜索 Commits
+     */
+    searchCommits(filter) {
+        try {
+            const { query, author, since, until, limit = 50 } = filter;
+            let cmd = `log -${limit} --format="%H%n%P%n%h%n%an%n%ai%n%s%n%D%n--END--"`;
+            if (query) {
+                cmd += ` --grep="${query}"`;
+            }
+            if (author) {
+                cmd += ` --author="${author}"`;
+            }
+            if (since) {
+                cmd += ` --since="${since}"`;
+            }
+            if (until) {
+                cmd += ` --until="${until}"`;
+            }
+            const output = this.execGit(cmd);
+            if (!output) {
+                return { success: true, data: [] };
+            }
+            const commits = [];
+            const entries = output.split('--END--\n').filter(e => e.trim());
+            for (const entry of entries) {
+                const lines = entry.trim().split('\n');
+                if (lines.length >= 7) {
+                    // 解析 parents（空格分隔的 hash 列表）
+                    const parents = lines[1].trim() ? lines[1].trim().split(' ') : [];
+                    // 解析 refs（逗号分隔，可能为空）
+                    const refsStr = lines[6].trim();
+                    const refs = refsStr ? refsStr.split(',').map(r => r.trim()) : [];
+                    commits.push({
+                        hash: lines[0],
+                        shortHash: lines[2],
+                        author: lines[3],
+                        date: lines[4],
+                        message: lines[5],
+                        parents,
+                        refs,
+                    });
+                }
+            }
+            return { success: true, data: commits };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取文件修改历史
+     */
+    getFileHistory(file, limit = 50) {
+        try {
+            if (!file || !file.trim()) {
+                return {
+                    success: false,
+                    error: 'Filename cannot be empty',
+                };
+            }
+            const format = '%H%n%P%n%h%n%an%n%ai%n%s%n%D%n--END--';
+            const output = this.execGit(`log -${limit} --follow --format="${format}" -- "${file}"`);
+            if (!output) {
+                return { success: true, data: [] };
+            }
+            const commits = [];
+            const entries = output.split('--END--\n').filter(e => e.trim());
+            for (const entry of entries) {
+                const lines = entry.trim().split('\n');
+                if (lines.length >= 7) {
+                    const hash = lines[0];
+                    // 解析 parents 和 refs
+                    const parents = lines[1].trim() ? lines[1].trim().split(' ') : [];
+                    const refsStr = lines[6].trim();
+                    const refs = refsStr ? refsStr.split(',').map(r => r.trim()) : [];
+                    // 获取该 commit 中文件的 diff
+                    let diff = '';
+                    try {
+                        diff = this.execGit(`show "${hash}" -- "${file}"`);
+                    }
+                    catch {
+                        diff = '';
+                    }
+                    commits.push({
+                        hash,
+                        shortHash: lines[2],
+                        author: lines[3],
+                        date: lines[4],
+                        message: lines[5],
+                        parents,
+                        refs,
+                        diff,
+                    });
+                }
+            }
+            return { success: true, data: commits };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 获取文件 Blame 信息
+     */
+    getBlame(file) {
+        try {
+            if (!file || !file.trim()) {
+                return {
+                    success: false,
+                    error: 'Filename cannot be empty',
+                };
+            }
+            // 使用 --porcelain 格式获取详细信息
+            const output = this.execGit(`blame --porcelain "${file}"`);
+            const lines = output.split('\n');
+            const blameLines = [];
+            let i = 0;
+            let lineNumber = 1;
+            while (i < lines.length) {
+                const line = lines[i];
+                // 解析 blame 行（格式：hash origLine finalLine [numLines]）
+                const match = line.match(/^([0-9a-f]{40}) \d+ (\d+)/);
+                if (!match) {
+                    i++;
+                    continue;
+                }
+                const commit = match[1];
+                lineNumber = parseInt(match[2]);
+                // 跳过到 author 行
+                let author = '';
+                let date = '';
+                let content = '';
+                i++;
+                while (i < lines.length) {
+                    const infoLine = lines[i];
+                    if (infoLine.startsWith('author ')) {
+                        author = infoLine.substring(7);
+                    }
+                    else if (infoLine.startsWith('author-time ')) {
+                        const timestamp = parseInt(infoLine.substring(12));
+                        date = new Date(timestamp * 1000).toISOString();
+                    }
+                    else if (infoLine.startsWith('\t')) {
+                        content = infoLine.substring(1);
+                        i++;
+                        break;
+                    }
+                    i++;
+                }
+                blameLines.push({
+                    lineNumber,
+                    commit: commit.substring(0, 8),
+                    author,
+                    date,
+                    content,
+                });
+            }
+            return { success: true, data: blameLines };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 比较两个分支
+     */
+    compareBranches(base, target) {
+        try {
+            if (!base || !target) {
+                return {
+                    success: false,
+                    error: 'Branch name cannot be empty',
+                };
+            }
+            // 获取 ahead/behind 数量
+            const revList = this.execGit(`rev-list --left-right --count "${base}...${target}"`);
+            const [behind, ahead] = revList.split('\t').map(Number);
+            // 获取不同的文件列表
+            const diffOutput = this.execGit(`diff --name-status "${base}..${target}"`);
+            const files = [];
+            if (diffOutput) {
+                diffOutput.split('\n').forEach(line => {
+                    if (!line)
+                        return;
+                    const parts = line.split('\t');
+                    if (parts.length >= 2) {
+                        files.push({
+                            status: parts[0],
+                            file: parts[1],
+                        });
+                    }
+                });
+            }
+            return {
+                success: true,
+                data: {
+                    ahead: ahead || 0,
+                    behind: behind || 0,
+                    files,
+                },
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * ========== Git Enhanced Features - Tags & Remotes ==========
+     */
+    /**
+     * 获取所有 Tags
+     */
+    getTags() {
+        try {
+            // 获取所有 tag 列表
+            const tagList = this.execGit('tag -l');
+            if (!tagList) {
+                return { success: true, data: [] };
+            }
+            const tags = [];
+            const tagNames = tagList.split('\n').filter(Boolean);
+            for (const name of tagNames) {
+                try {
+                    // 获取 tag 指向的 commit
+                    const commit = this.execGit(`rev-list -n 1 "${name}"`);
+                    // 尝试获取 annotated tag 信息
+                    try {
+                        const tagInfo = this.execGit(`tag -l --format="%(taggername)|%(taggerdate:iso)|%(contents:subject)" "${name}"`);
+                        const parts = tagInfo.split('|');
+                        if (parts[0]) {
+                            // Annotated tag
+                            tags.push({
+                                name,
+                                commit,
+                                tagger: parts[0],
+                                date: parts[1],
+                                message: parts[2],
+                                type: 'annotated',
+                            });
+                        }
+                        else {
+                            // Lightweight tag
+                            tags.push({
+                                name,
+                                commit,
+                                type: 'lightweight',
+                            });
+                        }
+                    }
+                    catch {
+                        // Lightweight tag (没有 tagger 信息)
+                        tags.push({
+                            name,
+                            commit,
+                            type: 'lightweight',
+                        });
+                    }
+                }
+                catch {
+                    // 跳过有问题的 tag
+                    continue;
+                }
+            }
+            return { success: true, data: tags };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 创建 Tag
+     */
+    createTag(name, message, type = 'lightweight', commit) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Tag name cannot be empty',
+                };
+            }
+            const target = commit ? ` "${commit}"` : '';
+            if (type === 'annotated') {
+                if (!message) {
+                    return {
+                        success: false,
+                        error: 'Annotated tag requires a message',
+                    };
+                }
+                this.execGit(`tag -a "${name}" -m "${message.replace(/"/g, '\\"')}"${target}`);
+            }
+            else {
+                this.execGit(`tag "${name}"${target}`);
+            }
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 删除 Tag
+     */
+    deleteTag(name) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Tag name cannot be empty',
+                };
+            }
+            this.execGit(`tag -d "${name}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 推送所有 Tags
+     */
+    async pushTags() {
+        try {
+            await this.execGitNetwork('push --tags');
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 获取所有 Remotes
+     */
+    getRemotes() {
+        try {
+            const output = this.execGit('remote -v');
+            if (!output) {
+                return { success: true, data: [] };
+            }
+            const remotes = new Map();
+            output.split('\n').forEach(line => {
+                if (!line)
+                    return;
+                // 格式: origin  https://github.com/user/repo.git (fetch)
+                const match = line.match(/^(\S+)\s+(\S+)\s+\((fetch|push)\)$/);
+                if (!match)
+                    return;
+                const [, name, url, type] = match;
+                if (!remotes.has(name)) {
+                    remotes.set(name, {
+                        name,
+                        fetchUrl: '',
+                        pushUrl: '',
+                    });
+                }
+                const remote = remotes.get(name);
+                if (type === 'fetch') {
+                    remote.fetchUrl = url;
+                }
+                else if (type === 'push') {
+                    remote.pushUrl = url;
+                }
+            });
+            return {
+                success: true,
+                data: Array.from(remotes.values()),
+            };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error.message || String(error),
+            };
+        }
+    }
+    /**
+     * 添加 Remote
+     */
+    addRemote(name, url) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Remote name cannot be empty',
+                };
+            }
+            if (!url || !url.trim()) {
+                return {
+                    success: false,
+                    error: 'Remote URL cannot be empty',
+                };
+            }
+            this.execGit(`remote add "${name}" "${url}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * 删除 Remote
+     */
+    removeRemote(name) {
+        try {
+            if (!name || !name.trim()) {
+                return {
+                    success: false,
+                    error: 'Remote name cannot be empty',
+                };
+            }
+            this.execGit(`remote remove "${name}"`);
+            return { success: true };
+        }
+        catch (error) {
+            return { success: false, error: error.message || String(error) };
+        }
+    }
+    /**
+     * Fetch 远程更新
+     */
+    async fetch(remote) {
+        try {
+            const cmd = remote ? `fetch "${remote}"` : 'fetch --all';
+            await this.execGitNetwork(cmd);
+            return { success: true };
+        }
+        catch (error) {
+            const msg = error.message || String(error);
+            const { errorType, friendlyMsg } = this.classifyNetworkError(msg);
+            return { success: false, error: friendlyMsg, errorType };
+        }
+    }
+}
+//# sourceMappingURL=git-manager.js.map