Skip to content

T99: push a verified fix to your own pull request - #83

Merged
imthi16 merged 2 commits into
mainfrom
task/T99-push-fix
Nov 4, 2026
Merged

imthi16 merged 2 commits into
mainfrom
task/T99-push-fix

Conversation

@imthi16

@imthi16 imthi16 commented Nov 4, 2026

Copy link
Copy Markdown
Owner

Why

On a BLOCK run with verified fixes, Verify the fixed commit verified the pull request's current GitHub head. The fix lived only under the local refs/proofmerge/fix/, and nothing pushed it, so the button checked the same commit again and gave the same BLOCK.

What

  • proofmerge push-fix <proof.json> --pr N --repo R [--dry-run] builds one commit from every verified fix. It refuses when two fixes change one file differently. The commit's parent is the head the run checked, and it goes to the PR's branch without force. It refuses unless all of these hold:

    • the PR is open;
    • the PR is still at the checked commit;
    • the PR is not from a fork;
    • the signed-in gh account opened the PR.

    For anyone else's PR, post the fix instead. Each fix was checked alone, so the output says to verify again.

  • App changes:

    • New button: Push the fix to PR #N as @account. Its confirm dialog names the account.
    • The old button is renamed to Verify PR #N again.
    • Jobs that had no title (approve, Ponytail, push-fix) showed "undefined: failed". They have titles now.

Checked

  • tests/test_push_fix.py:
    • Combining fixes, and refusing a conflict.
    • The push is one fast-forward commit with the fixed content and no --force.
    • Refused with no push: another author, a moved head, a merged PR, a fork, a bad branch name.
  • A test for the push-fix job.
  • Full suite: 955 passed, 1 skipped. Ruff clean.
  • Real Chrome on a scratch run with a verified fix: both buttons, the dialog (Escape closes it), and the refusal toast with its title. No console errors.

Not checked

  • A real push to GitHub. No test pushes anything.
  • The Control Center (/).

"Verify the fixed commit" verified the PR's current GitHub head, but the
fix only lived under the local refs/proofmerge/fix/, so it checked the
same commit and gave the same BLOCK.

`proofmerge push-fix` builds one commit from every verified fix on the
head the run checked and pushes it to the PR branch without force. It
refuses unless the PR is open, still at that commit, not from a fork and
opened by the signed-in gh account. The app gets "Push the fix to PR #N
as @account" with a confirm, and the old button reads "Verify PR #N
again". Jobs with no title (approve, Ponytail, push-fix) showed
"undefined: failed"; they have titles now.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-04T10:30:13.109818Z 4ef31aa PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@imthi16
imthi16 merged commit 7ed8c53 into main Nov 4, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants