feat: implement issue #1607 — dev-lead force-pushes from a stale base and silently discards maintainer steering commits (observed on #1604: a human commit was destroyed and its decision reverted)

Merged
DO
2mo ago
+731-34

User description

Closes #1607

Implemented by dev-lead agent. Please review.

Summary by CodeRabbit

  • Improvements

    • Strengthened branch update safeguards to better protect remote changes during rebases, retries, and concurrent updates.
    • Added clearer reporting when remote commits are incorporated, overwritten, or require escalation.
    • Rebase instructions now include a safer push option and recovery steps if the push is rejected.

  • New Features

    • Added read-only audits to identify potentially stale pull request bases.
    • Added detection for suspicious rewritten commit histories.

  • Tests

    • Expanded coverage for remote reconciliation, conflict handling, protected force pushes, and stale-base detection.

CodeAnt-AI Description

Prevent stale-base pushes from discarding maintainer commits

What Changed

  • Before rewriting a branch, dev-lead checks the current remote head and incorporates concurrent maintainer commits instead of replacing them.
  • If a maintainer commit conflicts with dev-lead's changes, the push stops for human review and leaves the remote branch unchanged.
  • Self-rewrites remain supported, but force-pushes now require safeguards that prevent overwriting commits not actually incorporated.
  • Maintainer commits included during reconciliation, refused pushes, and overwritten dev-lead commits are reported in the run summary or logs.
  • Added a read-only audit that flags open pull requests showing signs of stale-base force-pushes, including commits removed by earlier force-pushes.
  • Added coverage for concurrent updates, conflicts, safe self-rewrites, identity checks, merge races, and stale-base detection.

Impact

✅ No discarded maintainer steering commits
✅ Safer force-pushes after concurrent branch updates
✅ Clearer escalation for conflicting changes

💡 Usage Guide

Checking Your Pull Request

Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.

Talking to CodeAnt AI

Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:

@codeant-ai ask: Your question here

This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.

Example

@codeant-ai ask: Can you suggest a safer alternative to storing this secret?

Preserve Org Learnings with CodeAnt

You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:

@codeant-ai: Your feedback here

This helps CodeAnt AI learn and adapt to your team's coding style and standards.

Example

@codeant-ai: Do not flag unused imports.

Retrigger review

Ask CodeAnt AI to review the PR again, by typing:

@codeant-ai: review

Check Your Repository Health

To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.