Repository navigation

F6b: one-click merge job with a required-check wait - #161

Draft

mchwang wants to merge 42 commits into

codex/f6a-rewritten-head-pushfrom

codex/f6b-merge-handoff

Draft

F6b: one-click merge job with a required-check wait#161
mchwang wants to merge 42 commits into
codex/f6a-rewritten-head-pushfrom
codex/f6b-merge-handoff

Commits on Oct 12, 2026
- F6b: scan for an earlier fix from the last clear check's base
  
  mchwang
  and
  claude
  committed
  3ade421
- F6b: one-click merge job with a required-check wait
  
  mchwang
  and
  claude
  committed
  4a3d23e
- Stop the job's guarded merge on shutdown; end cancelled at every step
  
  mchwang
  and
  claude
  committed
  7cc6ab2
- Test the readiness hand-off for real; stop jobs as shutdown begins
  
  mchwang
  and
  claude
  committed
  79b7fd5
- Scan from the PR's own pre-PR check; settle a job from its attempt first
  
  mchwang
  and
  claude
  committed
  e9575aa
- Settle a restarted job from its attempt; offer merge for a base conflict
  
  mchwang
  and
  claude
  committed
  ffb995e
- Let a merge-blocked task start an amended plan; fix cancel test setups
  
  mchwang
  and
  claude
  committed
  922007f
- Block job and task together; decide a job only from its own attempt
  
  mchwang
  and
  claude
  committed
  def4b0a
- Scan from where the pre-PR check stopped; document the 250-commit limit
  
  mchwang
  and
  claude
  committed
  19d5abc
- Address Copilot: continuous scan, replayed refusals, strict wait, focus
  
  mchwang
  and
  claude
  committed
  18fc568
- Keep saved merge refusals out of the task's latest job
  
  mchwang
  and
  claude
  committed
  727f279
- Admit issue trust before a merge job starts; correct two doc claims
  
  mchwang
  and
  claude
  committed
  db189ae
- Say exactly when shutdown stops a merge job's preparation
  
  mchwang
  and
  claude
  committed
  841e395
- Correct the task status the merge-handoff doc gives for queued and failed jobs
  
  mchwang
  and
  claude
  committed
  fc57d20
- Test that a retried job's queue leaves the task approved, merge blocked
  
  mchwang
  and
  claude
  committed
  76c81f2
- Keep the Merge button focused when a merge-job click is refused; qualify the scan-range claim
  
  mchwang
  and
  claude
  committed
  368495c
- Draw an aria-disabled Merge button as inactive
  
  mchwang
  and
  claude
  committed
  9e0ee39
- Update only the merge control when a merge job ends
  
  mchwang
  and
  claude
  committed
  1234091
- Scan for an earlier fix from the task's first clear check, whichever opening merges
  
  mchwang
  and
  claude
  committed
  ab74aec
- Scan from the first opening into the current base branch
  
  mchwang
  and
  claude
  committed
  be4f391
- Scan from the task's original base when the first opening's check did not
  
  mchwang
  and
  claude
  committed
  f6eb190
- Explain correctly why the already-fixed scan covers a rebase's commits
  
  mchwang
  and
  claude
  committed
  887f0cd
- Reflow the already-fixed range comment
  
  mchwang
  and
  claude
  committed
  7302d68
- Block a task only with its still-running job, and test the shared transaction
  
  mchwang
  and
  claude
  committed
  b3ba376
- Test a queued attempt at startup and a failed GitHub read while waiting
  
  mchwang
  and
  claude
  committed
  4ea8724
- Test that shutdown awaits a merge job before the store closes
  
  mchwang
  and
  claude
  committed
  3293278
- Test that closing the merge job waits for it to settle
  
  mchwang
  and
  claude
  committed
  2e3e860
- Name the pre-v19 fallback in the guarded-merge scan description
  
  mchwang
  and
  claude
  committed
  777c9b5
- Address Copilot: block only while readiness holds; shutdown answers 503
  
  mchwang
  and
  claude
  committed
  0180256
- Fail the job when GitHub refuses a changed head; answer 503 when shutdown stops a merge click
  
  mchwang
  and
  claude
  committed
  7180aad
- Name the shutdown reload test for what it checks
  
  mchwang
  and
  claude
  committed
  cbacd19
- Merge F6a (f3bc3e1, with main 22e76a8) into F6b
  
  mchwang
  and
  claude
  committed
  2c5ccc3
- Address Copilot: closed tasks never offered, refusals bound to their review, neutral poll message
  
  mchwang
  and
  claude
  committed
  1b81ee9
- Name the review-change case in the merge-handoff shutdown row
  
  mchwang
  and
  claude
  committed
  7604a79
- Merge F6a (57b7ccb) into F6b
  
  mchwang
  and
  claude
  committed
  d61da98
- Test admission guards; say a retry after a refused merge and a rebase needs review
  
  mchwang
  and
  claude
  committed
  8b36586
- Merge F6a (749a977) into F6b
  
  mchwang
  and
  claude
  committed
  1874e6a
- Test the retry after a refused merge and a rebase through real preparation
  
  mchwang
  and
  claude
  committed
  ad00767
- Word the replacement-review blocker by its cause
  
  mchwang
  and
  claude
  committed
  8c3b171
Commits on Oct 13, 2026
- Address Copilot: new key after a job ends, keep in-flight drafts, answer the latest job
  
  mchwang
  and
  claude
  committed
  da0204a
- Merge F6a (a734646) into F6b
  
  mchwang
  and
  claude
  committed
  c265333
- Drop a retained merge key once another job is the latest
  
  mchwang
  and
  claude
  committed
  2a9534d

Commits

Commits on Oct 12, 2026

Commits on Oct 13, 2026