Repository navigation
Session Handoff [auto-2490]: Gate Prose on the Merge Commit's Own Base per #2490 #2526
Description
Next steps, in priority order
- Fix Gate Prose on the Merge Commit's Own Base, Not the Event's base.sha #2490 in one pull request to develop. The prose gate step in
.github/workflows/validate-task.ymlpassesbase: ${{ github.event.pull_request.base.sha }}while the job checks out GitHub's merge commit, so a base branch that moved after the event was recorded makes the gate scan other pull requests' lines. Diff against the base the checkout was built on, the merge commit's first parent, so the gate's scope equals the pull request's own change. Done looks like: a pull request whose base moved after its event is gated on its own diff only, a test or constructed run showing the gate's scope on a merge commit whose first parent differs frombase.sha, and a body carryingCloses on promotion: #2490. - Under scope
main, promote that fix per the unattended worker's procedure.
External blockers
None known. Copilot and CodeRabbit availability is re-read live at the drive, per drive-pr.
Internal dependencies
The prose-gate composite action under .github/actions/ consumes the base input, so read how it resolves that input before choosing where the first-parent resolution happens. Keep the promotion-run behavior the step's comments describe, where a develop -> main run diffs against the default branch's tip.
State
No branch, worktree, or pull request yet. Open pull request #2523 targets develop on the Windows lane and touches no workflow file. Develop is two commits ahead of main.
The parked decision queue
Not applicable to this lane.
What the last round did
The unattended picker ranked #2490 as a correctness defect in a running gate that fails pull requests adding no violation, and opened this lane.
What not to repeat
Nothing yet.
New learnings
None yet.
Activity
ptr727 commentedon Oct 8, 2026
Parked: waiting on decision #2533
Done
developasafc77cb9.Resolve prose base stepinvalidate-task.ymldiffs against the merge commit's first parent, and falls back to the event'sbase.shawhen the checkout is no merge commit.TestTheGateDiffsAgainstTheMergeCommitsOwnBaseintests/test_prose_lint.py.feature/auto-2490worktree, its local branch, and its remote branch are all removed, and the base clone is fast-forwarded todevelop. No worktree was left standing.developintomain, at headafc77cb90d205d83dca33a99f9356beba9a7146c. Its body carriesFixes #2490.mergeStateStatusisCLEAN.Remaining
pr_review.py waitexited 43 on Copilot's<summary><strong>2 open findings</strong></summary>block, which is the shape Recognize Copilot's Collapsible "N Open Findings" Overview Block in pr_review.py #2480 tracks. The script leaves a merge over an unrecognized shape to the maintainer, so this lane parked rather than merging.Resuming
gh pr view 2532 --repo ptr727/ProjectTemplate --json headRefOid. Merge Promote develop to main: Gate Prose on the Merge Commit's Own Base #2532 permerge-and-releaseonly if the head still matches the one above.pr_review.py wait 2532.No lesson issue was filed.
ptr727 commentedon Oct 8, 2026
Closed out. #2529 fixed #2490 into develop, and promotion #2532 merged to main as 2d5601d once the maintainer answered #2533 (merge over the unrecognized overview block #2480 tracks). #2490 is closed. Filed along the way: #2533. Lane complete, no successor.