fix: surface AI agent errors during merge/rebase conflict resolution #467
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allow users to specify an AI agent with optional model for the merge command (e.g., rover merge 1 -a claude:sonnet). All agent constructors now accept an optional model parameter passed through to their CLI. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Add a new `rover rebase` command that rebases a task's branch onto the current branch. Includes AI-powered conflict resolution, automatic commit of uncommitted worktree changes, and -a/--agent flag support. Also adds rebaseBranch, abortRebase, and continueRebase methods to Git. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Stop silently swallowing errors in resolveMergeConflicts across all agent
implementations (claude, gemini, codex, cursor, qwen) so callers can
surface the actual failure reason. Also log errors in generateCommitMessage.
The resolve functions in merge.ts and rebase.ts now return
{ success, failureReason } instead of boolean, so the actual error
is surfaced in both spinner output and --json mode.
Closes endorhq#464
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
dataforxyz
force-pushed
the
fix/surface-agent-errors
branch
from
357821b to
e4aacf2
Compare
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
resolveMergeConflictsacross all 5 agent implementations (claude, gemini, codex, cursor, qwen) — errors now propagate to callers which already have proper error display logic (Error resolving ${filePath}: ${error})generateCommitMessagebefore returning null, matching the pattern used by other methods likeexpandTaskNo changes to merge.ts or rebase.ts — the fix is entirely in the shared agent layer.
Closes #464
Test plan
pnpm build— compiles successfullypnpm test— all 338 tests pass🤖 Generated with Claude Code