@jingyi0605/codingns 0.2.0 → 0.3.0

package/dist/server/modules/worktree/worktree-manager.js

@@ -0,0 +1,292 @@
+import fs from "node:fs";
+import path from "node:path";
+import { AppError } from "../../shared/errors/app-error.js";
+import { nowIso } from "../../shared/utils/time.js";
+const WORKTREE_CREATE_TIMEOUT_MS = 30_000;
+export class WorktreeManager {
+    workspaceService;
+    workspaceWorktreeRepository;
+    gitReadService;
+    gitCommandRunner;
+    constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner) {
+        this.workspaceService = workspaceService;
+        this.workspaceWorktreeRepository = workspaceWorktreeRepository;
+        this.gitReadService = gitReadService;
+        this.gitCommandRunner = gitCommandRunner;
+    }
+    async create(input) {
+        const sourceWorkspaceId = input.sourceWorkspaceId.trim();
+        const branchName = normalizeBranchName(input.branchName);
+        if (!sourceWorkspaceId) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "来源工作区不能为空",
+                field: "sourceWorkspaceId"
+            });
+        }
+        const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceWorkspaceId);
+        const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(sourceWorkspaceId);
+        const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceMeta?.rootWorkspaceId ?? sourceWorkspaceId);
+        const sourceStatus = await this.gitReadService.getStatus(sourceWorkspaceId);
+        if (sourceStatus.snapshot.isDirty) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "WORKTREE_SOURCE_DIRTY",
+                detail: "来源工作区存在未提交改动，不能直接创建子工作树"
+            });
+        }
+        await this.ensureBranchNameValid(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
+        await this.ensureBranchDoesNotExist(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName);
+        const baseRef = (input.baseRef?.trim() || sourceStatus.snapshot.branch || "HEAD").trim();
+        const baseCommit = await this.resolveBaseCommit(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, baseRef);
+        const targetPath = buildTargetPath(rootWorkspace.path, branchName);
+        ensureTargetPathSafe(rootWorkspace.path, targetPath);
+        if (fs.existsSync(targetPath)) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "WORKTREE_PATH_CONFLICT",
+                detail: "目标工作树目录已经存在，不能直接覆盖"
+            });
+        }
+        const timestamp = nowIso();
+        const displayName = normalizeDisplayName(input.displayName, branchName);
+        let createdWorkspace = null;
+        let worktreeCreated = false;
+        try {
+            fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+            await this.gitCommandRunner.run(sourceStatus.snapshot.repoRoot, ["worktree", "add", "-b", branchName, targetPath, baseRef], {
+                timeoutMs: WORKTREE_CREATE_TIMEOUT_MS,
+                workspaceId: sourceWorkspaceId,
+                operation: "worktree.create"
+            });
+            worktreeCreated = true;
+            createdWorkspace = this.workspaceService.importWorkspace(targetPath, displayName);
+            const headCommit = await this.resolveHeadCommit(targetPath, createdWorkspace.id);
+            const meta = this.workspaceWorktreeRepository.create({
+                workspaceId: createdWorkspace.id,
+                rootWorkspaceId: rootWorkspace.id,
+                parentWorkspaceId: sourceWorkspace.id,
+                sourceWorkspaceId: sourceWorkspace.id,
+                mergeTargetWorkspaceId: sourceWorkspace.id,
+                branchName,
+                baseRef,
+                baseCommit,
+                headCommit,
+                displayName,
+                depth: sourceMeta ? sourceMeta.depth + 1 : 1,
+                lifecycleStatus: "active",
+                mergedAt: null,
+                removedAt: null,
+                createdAt: timestamp,
+                updatedAt: timestamp
+            });
+            return {
+                workspace: createdWorkspace,
+                meta
+            };
+        }
+        catch (error) {
+            await this.rollbackCreate(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, targetPath, createdWorkspace, worktreeCreated);
+            throw mapCreateWorktreeError(error);
+        }
+    }
+    getTree(rootWorkspaceId) {
+        const requestedWorkspaceId = rootWorkspaceId.trim();
+        if (!requestedWorkspaceId) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "根工作区不能为空",
+                field: "rootWorkspaceId"
+            });
+        }
+        const rootMeta = this.workspaceWorktreeRepository.findByWorkspaceId(requestedWorkspaceId);
+        const resolvedRootWorkspaceId = rootMeta?.rootWorkspaceId ?? requestedWorkspaceId;
+        this.workspaceService.getWorkspaceOrThrow(resolvedRootWorkspaceId);
+        const records = this.workspaceWorktreeRepository
+            .listByRootWorkspaceId(resolvedRootWorkspaceId)
+            .filter((record) => record.lifecycleStatus !== "removed");
+        const nodeByWorkspaceId = new Map();
+        const roots = [];
+        for (const record of records) {
+            nodeByWorkspaceId.set(record.workspaceId, {
+                workspace: this.workspaceService.getWorkspaceOrThrow(record.workspaceId),
+                meta: record,
+                children: []
+            });
+        }
+        for (const record of records) {
+            const currentNode = nodeByWorkspaceId.get(record.workspaceId);
+            if (!currentNode) {
+                continue;
+            }
+            if (record.parentWorkspaceId === resolvedRootWorkspaceId) {
+                roots.push(currentNode);
+                continue;
+            }
+            const parentNode = nodeByWorkspaceId.get(record.parentWorkspaceId);
+            if (parentNode) {
+                parentNode.children.push(currentNode);
+                continue;
+            }
+            roots.push(currentNode);
+        }
+        return roots;
+    }
+    async ensureBranchNameValid(repoRoot, workspaceId, branchName) {
+        const result = await this.gitCommandRunner.run(repoRoot, ["check-ref-format", "--branch", branchName], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.create.validateBranch"
+        });
+        if (result.exitCode === 0) {
+            return;
+        }
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "工作树分支名不合法",
+            field: "branchName"
+        });
+    }
+    async ensureBranchDoesNotExist(repoRoot, workspaceId, branchName) {
+        const result = await this.gitCommandRunner.run(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.create.checkBranchExists"
+        });
+        if (result.exitCode !== 0) {
+            return;
+        }
+        throw new AppError({
+            statusCode: 409,
+            errorCode: "WORKTREE_BRANCH_EXISTS",
+            detail: "目标分支已经存在，不能重复创建工作树"
+        });
+    }
+    async resolveBaseCommit(repoRoot, workspaceId, baseRef) {
+        const result = await this.gitCommandRunner.run(repoRoot, ["rev-parse", "--verify", baseRef], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.create.resolveBaseRef"
+        });
+        const baseCommit = result.stdout.trim();
+        if (result.exitCode === 0 && baseCommit) {
+            return baseCommit;
+        }
+        throw new AppError({
+            statusCode: 404,
+            errorCode: "WORKTREE_BASE_REF_NOT_FOUND",
+            detail: "指定的 baseRef 不存在，不能创建工作树",
+            field: "baseRef"
+        });
+    }
+    async resolveHeadCommit(targetPath, workspaceId) {
+        const result = await this.gitCommandRunner.run(targetPath, ["rev-parse", "HEAD"], {
+            workspaceId,
+            operation: "worktree.create.resolveHeadCommit"
+        });
+        return result.stdout.trim();
+    }
+    async rollbackCreate(repoRoot, workspaceId, branchName, targetPath, createdWorkspace, worktreeCreated) {
+        if (createdWorkspace) {
+            this.workspaceService.removeWorkspace(createdWorkspace.id);
+        }
+        if (worktreeCreated || fs.existsSync(targetPath)) {
+            try {
+                await this.gitCommandRunner.run(repoRoot, ["worktree", "remove", "--force", targetPath], {
+                    allowNonZeroExit: true,
+                    workspaceId,
+                    operation: "worktree.create.rollbackRemove"
+                });
+            }
+            catch {
+                // 回滚阶段不再向外抛，优先保住原始错误。
+            }
+            if (fs.existsSync(targetPath)) {
+                fs.rmSync(targetPath, { recursive: true, force: true });
+            }
+        }
+        try {
+            await this.gitCommandRunner.run(repoRoot, ["branch", "-D", branchName], {
+                allowNonZeroExit: true,
+                workspaceId,
+                operation: "worktree.create.rollbackDeleteBranch"
+            });
+        }
+        catch {
+            // 分支删除失败只保留残留，不能覆盖原始错误。
+        }
+    }
+}
+function normalizeBranchName(branchName) {
+    const normalized = branchName.trim();
+    if (!normalized) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "工作树分支名不能为空",
+            field: "branchName"
+        });
+    }
+    return normalized;
+}
+function normalizeDisplayName(displayName, branchName) {
+    return displayName?.trim() || branchName;
+}
+function buildTargetPath(rootWorkspacePath, branchName) {
+    const rootPath = path.resolve(rootWorkspacePath);
+    const rootParentPath = path.dirname(rootPath);
+    const rootName = path.basename(rootPath);
+    return path.join(rootParentPath, `${rootName}.worktrees`, sanitizePathSegment(branchName));
+}
+function ensureTargetPathSafe(rootWorkspacePath, targetPath) {
+    const normalizedRootPath = path.resolve(rootWorkspacePath);
+    const normalizedTargetPath = path.resolve(targetPath);
+    const relative = path.relative(normalizedRootPath, normalizedTargetPath);
+    if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "WORKTREE_PATH_INVALID",
+            detail: "工作树目录不能落在根工作区目录内部"
+        });
+    }
+}
+function sanitizePathSegment(input) {
+    const sanitized = input
+        .trim()
+        .replace(/[\\/]+/g, "-")
+        .replace(/[^a-zA-Z0-9._-]+/g, "-")
+        .replace(/-+/g, "-")
+        .replace(/^-|-$/g, "");
+    return sanitized || "worktree";
+}
+function mapCreateWorktreeError(error) {
+    if (!(error instanceof AppError)) {
+        return error instanceof Error ? error : new Error(String(error));
+    }
+    if (error.errorCode !== "GIT_COMMAND_FAILED") {
+        return error;
+    }
+    if (error.message.includes("already exists")) {
+        return new AppError({
+            statusCode: 409,
+            errorCode: "WORKTREE_BRANCH_EXISTS",
+            detail: "目标分支已经存在，不能重复创建工作树"
+        });
+    }
+    if (error.message.includes("is already checked out")) {
+        return new AppError({
+            statusCode: 409,
+            errorCode: "WORKTREE_BRANCH_IN_USE",
+            detail: "目标分支已经被其他工作树占用，不能再次创建"
+        });
+    }
+    return new AppError({
+        statusCode: 500,
+        errorCode: "WORKTREE_CREATE_FAILED",
+        detail: error.message
+    });
+}
+//# sourceMappingURL=worktree-manager.js.map

package/dist/server/modules/worktree/worktree-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-manager.js","sourceRoot":"","sources":["../../../../src/modules/worktree/worktree-manager.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/worktree/worktree-merge-service.d.ts

@@ -0,0 +1,52 @@
+import type { Workspace, WorkspaceWorktreeRecord } from "../../types/domain.js";
+import type { WorkspaceWorktreeRepository } from "../../storage/repositories/workspace-worktree-repository.js";
+import type { WorkspaceService } from "../workspace/workspace-service.js";
+import type { GitReadService } from "../git/git-read-service.js";
+import type { GitCommandRunner } from "../git/git-command-runner.js";
+import type { WorktreeSyncService } from "./worktree-sync-service.js";
+export type WorktreeMergeBlockerCode = "SOURCE_NOT_ACTIVE" | "SOURCE_DIRTY" | "TARGET_DIRTY" | "HAS_ACTIVE_CHILDREN" | "NO_COMMITS_TO_MERGE" | "HAS_CONFLICTS";
+export interface WorktreeMergeBlocker {
+    code: WorktreeMergeBlockerCode;
+    detail: string;
+}
+export interface WorktreeMergePreviewResult {
+    workspaceId: string;
+    sourceWorkspace: Workspace;
+    targetWorkspace: Workspace;
+    meta: WorkspaceWorktreeRecord;
+    sourceBranchName: string;
+    targetBranchName: string;
+    sourceHeadCommit: string | null;
+    targetHeadCommit: string | null;
+    mergeBaseCommit: string | null;
+    ahead: number;
+    behind: number;
+    hasConflicts: boolean;
+    conflictPaths: string[];
+    alreadyMerged: boolean;
+    canMerge: boolean;
+    blockers: WorktreeMergeBlocker[];
+}
+export interface WorktreeMergeApplyResult {
+    preview: WorktreeMergePreviewResult;
+    applied: boolean;
+    mergeCommit: string | null;
+    meta: WorkspaceWorktreeRecord;
+}
+export declare class WorktreeMergeService {
+    private readonly workspaceService;
+    private readonly workspaceWorktreeRepository;
+    private readonly gitReadService;
+    private readonly gitCommandRunner;
+    private readonly worktreeSyncService;
+    constructor(workspaceService: WorkspaceService, workspaceWorktreeRepository: WorkspaceWorktreeRepository, gitReadService: GitReadService, gitCommandRunner: GitCommandRunner, worktreeSyncService: WorktreeSyncService);
+    preview(workspaceId: string): Promise<WorktreeMergePreviewResult>;
+    apply(workspaceId: string): Promise<WorktreeMergeApplyResult>;
+    private resolveActiveWorktreeMeta;
+    private normalizePreviewMeta;
+    private resolveCommit;
+    private resolveMergeBase;
+    private resolveAheadBehind;
+    private isAncestor;
+    private detectConflictPaths;
+}

package/dist/server/modules/worktree/worktree-merge-service.js

@@ -0,0 +1,293 @@
+import { AppError } from "../../shared/errors/app-error.js";
+import { nowIso } from "../../shared/utils/time.js";
+const WORKTREE_MERGE_TIMEOUT_MS = 60_000;
+export class WorktreeMergeService {
+    workspaceService;
+    workspaceWorktreeRepository;
+    gitReadService;
+    gitCommandRunner;
+    worktreeSyncService;
+    constructor(workspaceService, workspaceWorktreeRepository, gitReadService, gitCommandRunner, worktreeSyncService) {
+        this.workspaceService = workspaceService;
+        this.workspaceWorktreeRepository = workspaceWorktreeRepository;
+        this.gitReadService = gitReadService;
+        this.gitCommandRunner = gitCommandRunner;
+        this.worktreeSyncService = worktreeSyncService;
+    }
+    async preview(workspaceId) {
+        const meta = await this.resolveActiveWorktreeMeta(workspaceId);
+        const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.workspaceId);
+        const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(meta.parentWorkspaceId);
+        const [sourceStatus, targetStatus] = await Promise.all([
+            this.gitReadService.getStatus(sourceWorkspace.id),
+            this.gitReadService.getStatus(targetWorkspace.id)
+        ]);
+        const sourceHeadCommit = await this.resolveCommit(sourceWorkspace.path, sourceWorkspace.id, "HEAD");
+        const targetHeadCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const mergeBaseCommit = sourceHeadCommit && targetHeadCommit
+            ? await this.resolveMergeBase(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : null;
+        const { ahead, behind } = sourceHeadCommit && targetHeadCommit
+            ? await this.resolveAheadBehind(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : { ahead: 0, behind: 0 };
+        const alreadyMerged = Boolean(sourceHeadCommit)
+            && Boolean(targetHeadCommit)
+            && await this.isAncestor(targetWorkspace.path, targetWorkspace.id, sourceHeadCommit ?? "", targetHeadCommit ?? "");
+        const childRecords = this.workspaceWorktreeRepository
+            .listByParentWorkspaceId(meta.workspaceId)
+            .filter((record) => record.lifecycleStatus === "active" || record.lifecycleStatus === "removing");
+        const blockers = [];
+        const normalizedMeta = this.normalizePreviewMeta(meta, alreadyMerged);
+        if (!alreadyMerged && normalizedMeta.lifecycleStatus !== "active") {
+            blockers.push({
+                code: "SOURCE_NOT_ACTIVE",
+                detail: "当前子工作树不是活跃状态，不能继续合并"
+            });
+        }
+        if (sourceStatus.snapshot.isDirty) {
+            blockers.push({
+                code: "SOURCE_DIRTY",
+                detail: "当前子工作树存在未提交改动，先提交或清理后再合并"
+            });
+        }
+        if (targetStatus.snapshot.isDirty) {
+            blockers.push({
+                code: "TARGET_DIRTY",
+                detail: "直接父工作区存在未提交改动，不能接收合并"
+            });
+        }
+        if (childRecords.length > 0) {
+            blockers.push({
+                code: "HAS_ACTIVE_CHILDREN",
+                detail: "当前子工作树下面还有活跃子节点，必须先从叶子节点开始回收"
+            });
+        }
+        if (!alreadyMerged && ahead === 0) {
+            blockers.push({
+                code: "NO_COMMITS_TO_MERGE",
+                detail: "当前子工作树没有领先父工作区的提交"
+            });
+        }
+        const conflictPaths = !alreadyMerged
+            && ahead > 0
+            && blockers.every((item) => item.code !== "SOURCE_DIRTY" && item.code !== "TARGET_DIRTY")
+            ? await this.detectConflictPaths(targetWorkspace.path, targetWorkspace.id, targetHeadCommit, sourceHeadCommit)
+            : [];
+        if (conflictPaths.length > 0) {
+            blockers.push({
+                code: "HAS_CONFLICTS",
+                detail: `检测到合并冲突：${conflictPaths.join("、")}`
+            });
+        }
+        return {
+            workspaceId: meta.workspaceId,
+            sourceWorkspace,
+            targetWorkspace,
+            meta: normalizedMeta,
+            sourceBranchName: sourceStatus.snapshot.branch,
+            targetBranchName: targetStatus.snapshot.branch,
+            sourceHeadCommit,
+            targetHeadCommit,
+            mergeBaseCommit,
+            ahead,
+            behind,
+            hasConflicts: conflictPaths.length > 0,
+            conflictPaths,
+            alreadyMerged,
+            canMerge: blockers.length === 0 && !alreadyMerged,
+            blockers
+        };
+    }
+    async apply(workspaceId) {
+        const preview = await this.preview(workspaceId);
+        const meta = preview.meta;
+        if (!preview.alreadyMerged && preview.blockers.length > 0) {
+            const blocker = preview.blockers[0];
+            throw new AppError({
+                statusCode: 409,
+                errorCode: `WORKTREE_MERGE_${blocker.code}`,
+                detail: blocker.detail
+            });
+        }
+        const targetWorkspace = preview.targetWorkspace;
+        const timestamp = nowIso();
+        let applied = false;
+        if (!preview.alreadyMerged) {
+            const mergeResult = await this.gitCommandRunner.run(targetWorkspace.path, ["merge", "--no-ff", "--no-edit", preview.meta.branchName], {
+                allowNonZeroExit: true,
+                timeoutMs: WORKTREE_MERGE_TIMEOUT_MS,
+                workspaceId: targetWorkspace.id,
+                operation: "worktree.merge.apply"
+            });
+            if (mergeResult.exitCode !== 0) {
+                await this.gitCommandRunner.run(targetWorkspace.path, ["merge", "--abort"], {
+                    allowNonZeroExit: true,
+                    workspaceId: targetWorkspace.id,
+                    operation: "worktree.merge.abort"
+                });
+                throw new AppError({
+                    statusCode: 409,
+                    errorCode: "WORKTREE_MERGE_APPLY_FAILED",
+                    detail: mergeResult.stderr.trim() || mergeResult.stdout.trim() || "合并执行失败"
+                });
+            }
+            applied = true;
+        }
+        const mergeCommit = await this.resolveCommit(targetWorkspace.path, targetWorkspace.id, "HEAD");
+        const nextMeta = this.workspaceWorktreeRepository.update({
+            ...meta,
+            lifecycleStatus: "merged",
+            mergedAt: meta.mergedAt ?? timestamp,
+            updatedAt: timestamp
+        });
+        if (!nextMeta) {
+            throw new AppError({
+                statusCode: 500,
+                errorCode: "WORKTREE_META_UPDATE_FAILED",
+                detail: "工作树合并成功，但元数据更新失败"
+            });
+        }
+        const parentMeta = this.workspaceWorktreeRepository.findByWorkspaceId(targetWorkspace.id);
+        if (parentMeta) {
+            this.workspaceWorktreeRepository.update({
+                ...parentMeta,
+                headCommit: mergeCommit,
+                updatedAt: timestamp
+            });
+        }
+        return {
+            preview: {
+                ...preview,
+                meta: nextMeta,
+                alreadyMerged: true,
+                canMerge: false,
+                blockers: [],
+                targetHeadCommit: mergeCommit
+            },
+            applied,
+            mergeCommit,
+            meta: nextMeta
+        };
+    }
+    async resolveActiveWorktreeMeta(workspaceId) {
+        const normalizedWorkspaceId = workspaceId.trim();
+        if (!normalizedWorkspaceId) {
+            throw new AppError({
+                statusCode: 400,
+                errorCode: "INVALID_INPUT",
+                detail: "工作树 workspaceId 不能为空",
+                field: "workspaceId"
+            });
+        }
+        const meta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
+        if (!meta) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "WORKTREE_NOT_FOUND",
+                detail: "指定工作区不是子工作树"
+            });
+        }
+        await this.worktreeSyncService.syncRoot(meta.rootWorkspaceId);
+        const nextMeta = this.workspaceWorktreeRepository.findByWorkspaceId(normalizedWorkspaceId);
+        if (!nextMeta || nextMeta.lifecycleStatus === "removed") {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "WORKTREE_NOT_FOUND",
+                detail: "指定工作树已经不存在"
+            });
+        }
+        return nextMeta;
+    }
+    normalizePreviewMeta(meta, alreadyMerged) {
+        if (alreadyMerged) {
+            if (meta.lifecycleStatus === "merged" && meta.mergedAt) {
+                return meta;
+            }
+            return (this.workspaceWorktreeRepository.update({
+                ...meta,
+                lifecycleStatus: "merged",
+                mergedAt: meta.mergedAt ?? nowIso(),
+                updatedAt: nowIso()
+            }) ?? meta);
+        }
+        if (meta.lifecycleStatus === "active") {
+            return meta;
+        }
+        return (this.workspaceWorktreeRepository.update({
+            ...meta,
+            lifecycleStatus: "active",
+            mergedAt: null,
+            updatedAt: nowIso()
+        }) ?? meta);
+    }
+    async resolveCommit(cwd, workspaceId, ref) {
+        const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.resolveCommit"
+        });
+        return result.exitCode === 0 ? result.stdout.trim() || null : null;
+    }
+    async resolveMergeBase(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["merge-base", targetHeadCommit, sourceHeadCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewBase"
+        });
+        return result.exitCode === 0 ? result.stdout.trim() || null : null;
+    }
+    async resolveAheadBehind(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["rev-list", "--left-right", "--count", `${targetHeadCommit}...${sourceHeadCommit}`], {
+            workspaceId,
+            operation: "worktree.merge.previewAheadBehind"
+        });
+        const [behindRaw, aheadRaw] = result.stdout.trim().split(/\s+/);
+        return {
+            ahead: Number(aheadRaw ?? "0") || 0,
+            behind: Number(behindRaw ?? "0") || 0
+        };
+    }
+    async isAncestor(cwd, workspaceId, ancestorCommit, descendantCommit) {
+        const result = await this.gitCommandRunner.run(cwd, ["merge-base", "--is-ancestor", ancestorCommit, descendantCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewAncestor"
+        });
+        return result.exitCode === 0;
+    }
+    async detectConflictPaths(cwd, workspaceId, targetHeadCommit, sourceHeadCommit) {
+        if (!targetHeadCommit || !sourceHeadCommit) {
+            return [];
+        }
+        const result = await this.gitCommandRunner.run(cwd, ["merge-tree", "--write-tree", targetHeadCommit, sourceHeadCommit], {
+            allowNonZeroExit: true,
+            workspaceId,
+            operation: "worktree.merge.previewConflicts"
+        });
+        if (result.exitCode === 0) {
+            return [];
+        }
+        return Array.from(parseMergeConflictPaths(result.stdout, result.stderr));
+    }
+}
+function parseMergeConflictPaths(stdout, stderr) {
+    const paths = new Set();
+    const content = `${stdout}\n${stderr}`;
+    for (const line of content.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed) {
+            continue;
+        }
+        const stageMatch = trimmed.match(/^\d{6}\s+[0-9a-f]{40}\s+\d\t(.+)$/i);
+        if (stageMatch?.[1]) {
+            paths.add(stageMatch[1]);
+            continue;
+        }
+        const conflictMatch = trimmed.match(/Merge conflict in (.+)$/i);
+        if (conflictMatch?.[1]) {
+            paths.add(conflictMatch[1]);
+        }
+    }
+    return paths;
+}
+//# sourceMappingURL=worktree-merge-service.js.map