Method rebase

packages/server/src/git/worktree.manager.ts:559–597

* Rebase the current branch in the worktree onto the latest base branch. * Uses `git rebase --onto `. * * - If a rebase is already in progress, throws RebaseInProgressError * - On conflict, throws MergeConflictError with ConflictOp.REBASE (preserves r

(worktreePath: string, baseBranch: string)

   * - On non-conflict failure, auto-aborts to keep repo clean
   */
  async rebase(worktreePath: string, baseBranch: string): Promise<void> {
    // Pre-check 1: worktree must be clean (no uncommitted tracked changes)
    if (!(await this.isWorktreeClean(worktreePath))) {
      throw new WorktreeDirtyError(worktreePath);
    }

    // Pre-check 2: no rebase already in progress
    if (await this.isRebaseInProgress(worktreePath)) {
      throw new RebaseInProgressError();
    }

    // Get current branch name
    const currentBranchRaw = await execGit(worktreePath, ['rev-parse', '--abbrev-ref', 'HEAD']);
    const taskBranch = currentBranchRaw.trim();

    // Calculate merge-base
    const mergeBaseRaw = await execGit(worktreePath, ['merge-base', baseBranch, taskBranch]);
    const mergeBase = mergeBaseRaw.trim();

    try {
      await execGit(worktreePath, ['rebase', '--onto', baseBranch, mergeBase, taskBranch]);
    } catch (err) {
      // Check if it's a conflict
      if (await this.isRebaseInProgress(worktreePath)) {
        const conflictedFiles = await this.getConflictedFilesIn(worktreePath);
        if (conflictedFiles.length > 0) {
          throw new MergeConflictError(conflictedFiles, ConflictOp.REBASE);
        }
      }

      // Non-conflict failure: auto-abort to keep repo clean
      try {
        await execGit(worktreePath, ['rebase', '--abort']);
      } catch {
        // ignore abort failure
      }
      throw err;
    }
  }

  /**
   * Get the current Git operation status of a worktree.