pdurlej/platform

Fork 0

fix(ci): resolve PR from direct merge commit hint #427

Closed

codex wants to merge 0 commits from codex/fix/merged-pr-direct-merge-fallback into main

codex commented

2026-05-24 15:28:01 +02:00

Collaborator

Canary status: missing — rely on required Forgejo checks before merge

Canary Context Pack

Product story

Trusted-main auto-apply needs a PR number for audit binding. Forgejo API merge returned 405 today, so the operator-approved fallback was a normal git merge commit. The CI resolver should tolerate that exact merge shape without accepting plain direct pushes.

What changed

Add a narrow fallback in find_merged_pr.py for local merge commits whose subject ends in (#PR).
The fallback requires the commit to have at least two parents and the referenced PR head SHA to match a non-main parent.
Add contract tests for fallback and for rejecting plain direct commits.

Why it changed

After #423/#425 were merged via git push, workflow dispatch could not bind the current trusted main SHA to a PR because Forgejo did not mark the PR object as merged. That blocked the backup-backed voice-transcription smoke even though the code path was operator-approved.

Files touched

control-plane/platformctl/ci/find_merged_pr.py
control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py

Runtime evidence

Local tests:

python3 -m pytest control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py -q → 40 passed
python3 -m pytest tests/test_l4_verify.py::test_yaml_syntax_valid -q → 102 passed
git diff --check → clean
Live dry-run:
current main SHA resolved to PR #425 through the merge-commit fallback.

Known constraints

This is not a generic direct-push allowance. A non-merge commit with no PR-shaped subject and no PR head parent remains blocked.

Explicit out-of-scope

No production mutation, no module changes, no runner changes.

Requested decision

Merge after checks are green.

Merge blockers

Any test/check failure or fallback matching plain direct commits.

Spec sources read

control-plane/platformctl/ci/find_merged_pr.py — PR binding logic
control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py — CI contract tests

Canary status: missing — rely on required Forgejo checks before merge ## Canary Context Pack ### Product story Trusted-main auto-apply needs a PR number for audit binding. Forgejo API merge returned 405 today, so the operator-approved fallback was a normal git merge commit. The CI resolver should tolerate that exact merge shape without accepting plain direct pushes. ### What changed - Add a narrow fallback in `find_merged_pr.py` for local merge commits whose subject ends in `(#PR)`. - The fallback requires the commit to have at least two parents and the referenced PR head SHA to match a non-main parent. - Add contract tests for fallback and for rejecting plain direct commits. ### Why it changed After #423/#425 were merged via git push, workflow dispatch could not bind the current trusted main SHA to a PR because Forgejo did not mark the PR object as merged. That blocked the backup-backed voice-transcription smoke even though the code path was operator-approved. ### Files touched - `control-plane/platformctl/ci/find_merged_pr.py` - `control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py` ### Runtime evidence Local tests: - `python3 -m pytest control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py -q` → 40 passed - `python3 -m pytest tests/test_l4_verify.py::test_yaml_syntax_valid -q` → 102 passed - `git diff --check` → clean Live dry-run: - current `main` SHA resolved to PR #425 through the merge-commit fallback. ### Known constraints This is not a generic direct-push allowance. A non-merge commit with no PR-shaped subject and no PR head parent remains blocked. ### Explicit out-of-scope No production mutation, no module changes, no runner changes. ### Requested decision Merge after checks are green. ### Merge blockers Any test/check failure or fallback matching plain direct commits. ## Spec sources read - `control-plane/platformctl/ci/find_merged_pr.py` — PR binding logic - `control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py` — CI contract tests

codex added 1 commit

2026-05-24 15:28:01 +02:00

fix(ci): resolve PR from direct merge commit hint

base-is-main / guard (pull_request) Successful in 1s

Details

canary-required / collect-diff (pull_request) Successful in 5s

Details

infra-docs-drift / docs-drift (pull_request) Successful in 5s

Details

platformctl plan / auto-apply scope (pull_request) Successful in 20s

Details

pyfallow / Pyfallow gate (control-plane) (pull_request) Successful in 18s

Details

python-ci / Python 3.12 (pull_request) Successful in 40s

Details

python-ci / Python 3.13 (pull_request) Successful in 41s

Details

workflow-lint / lint (pull_request) Successful in 5s

Details

canary-required / canary (pull_request) Successful in 13s

Details

patchwarden-pr-sanity / sanity (pull_request) Successful in 20s

Details

patchwarden-pr-sanity / collect-diff (pull_request) Successful in 4s

Details

python-ci / Python 3.11 (pull_request) Successful in 37s

Details

7f066eb745

codex referenced this pull request from a commit

2026-05-24 15:32:01 +02:00

Merge pull request 'fix(ci): resolve PR from direct merge commit hint' (#427)

codex referenced this pull request

2026-05-24 15:40:41 +02:00

fix(ci): approve direct merge commit fallback #428

codex commented

2026-05-24 15:48:26 +02:00

Author

Collaborator

Closed after verified git merge commit 6824dea9d6 reached main. Forgejo merge API returned 405 during this maintenance path, so codex used a normal non-force merge push; follow-up CI fixes #425/#427/#428 preserve guarded fallback semantics.

Closed after verified git merge commit 6824dea9d69ce8a68962a926947fd51024cd64e0 reached main. Forgejo merge API returned 405 during this maintenance path, so codex used a normal non-force merge push; follow-up CI fixes #425/#427/#428 preserve guarded fallback semantics.

codex closed this pull request

2026-05-24 15:48:26 +02:00

codex referenced this pull request

2026-05-24 16:06:54 +02:00

docs(waves): formally close W0 W1 W2 #429