fix(w6d): bridge Iskra approval to Forgejo review #475

Merged

Iskra merged 1 commit from codex/w6d-automerge-review-bridge into main

2026-05-25 09:11:06 +02:00

codex commented

2026-05-25 09:03:55 +02:00

Collaborator

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

Canary Context Pack

Product story

W6d should let Iskra merge narrow, deterministic, docs/status-style PRs without Piotr doing the final click. The test run proved the merge token works, but only after a manual formal Forgejo review by Iskra.

What changed

The merge actor now creates a formal Forgejo APPROVED review as the merge actor after Matrix approval and deterministic readiness, immediately before merge.
Readiness ignores stale/dismissed approvals.
Readiness blocks PRs whose merge_base is behind base.sha, matching branch protection's out-of-date blocker.

Why it changed

The #470 smoke proved Matrix approval alone is not enough for Forgejo branch protection. Forgejo requires a current formal PR review, and stale reviews after branch updates must not be counted.

Files touched

control-plane/platformctl/ci/automerge_actor.py
control-plane/platformctl/ci/automerge_readiness.py
control-plane/platformctl/tests/test_automerge_actor.py
control-plane/platformctl/tests/test_automerge_readiness.py

Relevant context

W6d autonomous merge pilot; branch protection requires one current approval, required statuses, and non-outdated branch.

Runtime evidence

#470 was merged by Iskra after a fresh formal Iskra approval and successful automerge run #2723. This PR codifies that manual bridge.

Known constraints

The pilot remains narrow: docs/status/runbook/roadmap-only; no runtime, secret, workflow, module, schema, decision, script, or test PR is eligible for autonomous merge v0.

Explicit out-of-scope

This does not implement automatic branch update/rebase. Outdated PRs are blocked and must be updated before another automerge attempt.

Requested decision

Approve merge if tests and required checks are green.

Merge blockers

Failing tests or required Forgejo checks.
Any concern that the approval review should be created at a different point in the workflow.

Spec sources read

control-plane/platformctl/ci/automerge_actor.py — merge actor implementation.
control-plane/platformctl/ci/automerge_readiness.py — deterministic readiness gates.
control-plane/platformctl/tests/test_automerge_actor.py — actor coverage.
control-plane/platformctl/tests/test_automerge_readiness.py — readiness coverage.
.forgejo/workflows/automerge-pilot.yml — workflow call order.

Test plan

git diff --check
PYTHONPATH=control-plane pytest -q control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py control-plane/platformctl/tests/test_automerge_actor.py control-plane/platformctl/tests/test_automerge_readiness.py → 57 passed

Canary status: missing — rely on required Forgejo checks before merge ## Canary Context Pack ### Product story W6d should let Iskra merge narrow, deterministic, docs/status-style PRs without Piotr doing the final click. The test run proved the merge token works, but only after a manual formal Forgejo review by Iskra. ### What changed - The merge actor now creates a formal Forgejo `APPROVED` review as the merge actor after Matrix approval and deterministic readiness, immediately before merge. - Readiness ignores stale/dismissed approvals. - Readiness blocks PRs whose `merge_base` is behind `base.sha`, matching branch protection's out-of-date blocker. ### Why it changed The #470 smoke proved Matrix approval alone is not enough for Forgejo branch protection. Forgejo requires a current formal PR review, and stale reviews after branch updates must not be counted. ### Files touched - `control-plane/platformctl/ci/automerge_actor.py` - `control-plane/platformctl/ci/automerge_readiness.py` - `control-plane/platformctl/tests/test_automerge_actor.py` - `control-plane/platformctl/tests/test_automerge_readiness.py` ### Relevant context W6d autonomous merge pilot; branch protection requires one current approval, required statuses, and non-outdated branch. ### Runtime evidence #470 was merged by `Iskra` after a fresh formal Iskra approval and successful automerge run #2723. This PR codifies that manual bridge. ### Known constraints The pilot remains narrow: docs/status/runbook/roadmap-only; no runtime, secret, workflow, module, schema, decision, script, or test PR is eligible for autonomous merge v0. ### Explicit out-of-scope This does not implement automatic branch update/rebase. Outdated PRs are blocked and must be updated before another automerge attempt. ### Requested decision Approve merge if tests and required checks are green. ### Merge blockers - Failing tests or required Forgejo checks. - Any concern that the approval review should be created at a different point in the workflow. ## Spec sources read - `control-plane/platformctl/ci/automerge_actor.py` — merge actor implementation. - `control-plane/platformctl/ci/automerge_readiness.py` — deterministic readiness gates. - `control-plane/platformctl/tests/test_automerge_actor.py` — actor coverage. - `control-plane/platformctl/tests/test_automerge_readiness.py` — readiness coverage. - `.forgejo/workflows/automerge-pilot.yml` — workflow call order. ## Test plan - `git diff --check` - `PYTHONPATH=control-plane pytest -q control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py control-plane/platformctl/tests/test_automerge_actor.py control-plane/platformctl/tests/test_automerge_readiness.py` → 57 passed

codex added 1 commit

2026-05-25 09:03:55 +02:00

fix(w6d): bridge Iskra approval to Forgejo review

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

Details

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

Details

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

Details

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

Details

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