Method merge

packages/server/src/git/worktree.manager.ts:396–489

* Squash-merge a worktree branch into the target branch. * * Performs the following steps: * 1. Verify the worktree is clean * 2. Check branch divergence — fail if base branch has advanced * 3. Checkout target branch in the main repo * 4. Execute `git merge --squash --no-commit <ta

(
    worktreePath: string,
    targetBranch: string,
    options?: { commitMessage?: string }
  )

   * 6. Remove the worktree and delete the task branch
   */
  async merge(
    worktreePath: string,
    targetBranch: string,
    options?: { commitMessage?: string }
  ): Promise<{ sha: string; taskBranch: string }> {
    const mergeStart = performance.now();
    const step = (label: string, start: number) =>
      console.log(`[WorktreeManager.merge] ${label}: ${(performance.now() - start).toFixed(0)}ms`);

    // Determine the current branch of the worktree
    let t = performance.now();
    const currentBranchRaw = await execGit(worktreePath, ['rev-parse', '--abbrev-ref', 'HEAD']);
    const taskBranch = currentBranchRaw.trim();
    step('rev-parse branch', t);

    // 1. Check worktree is clean
    t = performance.now();
    const clean = await this.isWorktreeClean(worktreePath);
    step('isWorktreeClean', t);
    if (!clean) {
      throw new WorktreeDirtyError(worktreePath);
    }

    // 2. Check branch divergence
    t = performance.now();
    const status = await this.getBranchStatus(taskBranch, targetBranch);
    step('getBranchStatus', t);
    if (status.behind > 0) {
      throw new BranchesDivergedError(taskBranch, targetBranch, status.ahead, status.behind);
    }

    // 3. Checkout target branch in main repo
    t = performance.now();
    await execGit(this.repoPath, ['checkout', targetBranch]);
    step('checkout target', t);

    // 4. Squash merge (no commit yet)
    t = performance.now();
    try {
      await execGit(this.repoPath, [
        'merge',
        '--squash',
        '--no-commit',
        taskBranch,
      ]);
    } catch (err) {
      if (err instanceof GitError) {
        // Check for merge conflicts
        const conflictedFiles = await this.getConflictedFiles();
        if (conflictedFiles.length > 0) {
          // Abort the merge to leave the repo clean
          const mergeAborted = await execGit(this.repoPath, ['merge', '--abort']).then(() => true).catch(() => {
            // merge --abort may fail if no merge in progress, ignore
            return false;
          });
          throw new MergeConflictError(conflictedFiles, ConflictOp.MERGE, {
            mergeAborted,
            mergeStrategy: 'squash',