johba/disinto
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: try_merge_or_rebase rebase-failure spawn bypasses ci_fix_increment (#56)

Browse source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
openhands 2026-03-18 04:05:18 +00:00
parent 5c73ab3e53
commit cf8446b451
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/dev-poll.sh
View file

@ -144,9 +144,14 @@ try_merge_or_rebase() {
log "PR #${pr_num} rebased — CI will re-run, merge on next poll" log "PR #${pr_num} rebased — CI will re-run, merge on next poll"
git -C "${PROJECT_REPO_ROOT}" worktree remove "$worktree" 2>/dev/null || true git -C "${PROJECT_REPO_ROOT}" worktree remove "$worktree" 2>/dev/null || true
else else
log "PR #${pr_num} rebase failed — spawning dev-agent to fix"
matrix_send "dev" "❌ PR #${pr_num} rebase failed — spawning dev-agent" 2>/dev/null || true
git -C "${PROJECT_REPO_ROOT}" worktree remove --force "$worktree" 2>/dev/null || true git -C "${PROJECT_REPO_ROOT}" worktree remove --force "$worktree" 2>/dev/null || true
if handle_ci_exhaustion "$pr_num" "$issue_num"; then
log "PR #${pr_num} rebase failed — CI exhausted, not spawning"
return 1
fi
ci_fix_increment "$pr_num"
log "PR #${pr_num} rebase failed — spawning dev-agent to fix (attempt $((CI_FIX_ATTEMPTS+1))/3)"
matrix_send "dev" "❌ PR #${pr_num} rebase failed — spawning dev-agent (attempt $((CI_FIX_ATTEMPTS+1))/3)" 2>/dev/null || true
nohup "${SCRIPT_DIR}/dev-agent.sh" "$issue_num" >> "$LOGFILE" 2>&1 & nohup "${SCRIPT_DIR}/dev-agent.sh" "$issue_num" >> "$LOGFILE" 2>&1 &
log "started dev-agent PID $! for PR #${pr_num} (rebase fix)" log "started dev-agent PID $! for PR #${pr_num} (rebase fix)"
fi fi