feat(finish): schedule auto-merge-on-green when a merge is gated on required CI checks #464

Merged

hexajon merged 1 commit from issue-438-finish-ci-gated-merge into main

2026-08-27 07:31:39 +00:00

hexajon commented

2026-08-27 07:31:37 +00:00

Owner

Summary

On a repo whose default branch requires a status check, finish's merge failed with 405 "not all required status checks successful" because the required CI check had only just started - dropping the caller back into the manual watch-CI/merge/pull/delete flow finish exists to remove. Now a new gitea.IsMergeRequiredChecksPending predicate detects that specific 405, and MergeWithRetry re-issues the same merge with merge_when_checks_succeed so the FORGE merges the PR itself once the checks pass, returning an ErrAutoMergeScheduled sentinel. Every consumer of the shared merge path honors it - finish (local and remote), CLI pr merge, the MCP prs merge action, and orchestrate batch-merge and revert - reporting the scheduled merge and SKIPPING return-to-mainline (no pull, no branch delete; the forge merges and cleans up on green). The failure never falsely reports success: a failed schedule call surfaces verbatim. Classified before the behind-base 405 branch and separate from the #456 non-retryable/transient classes, so a CI-gated 405 is never mislabeled. #456's classification and the try-again-later backoff are untouched. Design: forge-side auto-merge-on-green (non-blocking), not a blocking poll. Tests cover the schedule path (second MergePR carries merge_when_checks_succeed), the non-CI-gated errors still failing verbatim, the happy path merging normally, and the misclassification guard.

Refs #438

## Summary On a repo whose default branch requires a status check, finish's merge failed with 405 "not all required status checks successful" because the required CI check had only just started - dropping the caller back into the manual watch-CI/merge/pull/delete flow finish exists to remove. Now a new gitea.IsMergeRequiredChecksPending predicate detects that specific 405, and MergeWithRetry re-issues the same merge with merge_when_checks_succeed so the FORGE merges the PR itself once the checks pass, returning an ErrAutoMergeScheduled sentinel. Every consumer of the shared merge path honors it - finish (local and remote), CLI pr merge, the MCP prs merge action, and orchestrate batch-merge and revert - reporting the scheduled merge and SKIPPING return-to-mainline (no pull, no branch delete; the forge merges and cleans up on green). The failure never falsely reports success: a failed schedule call surfaces verbatim. Classified before the behind-base 405 branch and separate from the #456 non-retryable/transient classes, so a CI-gated 405 is never mislabeled. #456's classification and the try-again-later backoff are untouched. Design: forge-side auto-merge-on-green (non-blocking), not a blocking poll. Tests cover the schedule path (second MergePR carries merge_when_checks_succeed), the non-CI-gated errors still failing verbatim, the happy path merging normally, and the misclassification guard. Refs #438

hexajon added 1 commit

2026-08-27 07:31:37 +00:00

feat(finish): schedule auto-merge-on-green when a merge is gated on required CI checks (#438 )

drift / govulncheck (pull_request) Has been skipped

Details

drift / surface-diff (pull_request) Successful in 59s

Details

drift / forgejo-smoke (pull_request) Has been skipped

Details

ci / mcp-conformance (pull_request) Successful in 1m49s

Details

ci / mcp-conformance (push) Successful in -1s