pdurlej/platform

Fork 0

docs(w6d): smoke controller self-merge path #826

Merged

Iskra merged 3 commits from codex/issue-823-automerge-selfmerge-smoke into main

2026-06-26 10:37:01 +02:00

codex commented

2026-06-25 15:54:31 +02:00

Collaborator

Canary status: not required — W6d safe-scope state/cycle self-merge smoke

Canary Context Pack

Product story

This is the follow-up to #825: prove that a boring safe-scope PR can pass Patchwarden and then be merged by the autonomous controller instead of by Piotr/manual merge.

What changed

Added one state-only W6d self-merge smoke note under state/cycle/.

Why it changed

Issue #823 acceptance still needs a PR that actually goes through the controller merge path after Patchwarden passes.

Files touched

state/cycle/W6d-controller-selfmerge-smoke-2026-06-25.md

Relevant context

#823 — Patchwarden unattended merge-safety loop.
#824 — readiness artifacts emit controller verdicts and exact-head merge actor guards.
#825 — first dogfood PR, manually merged by operator before self-merge could be tested.
docs/forgejo-agent-operations.md Autonomous Merge Readiness v0.

Runtime evidence

No runtime mutation. No deploy. No secrets. No branch protection, DNS, auth, ingress, routing, public exposure, or workflow change.

Known constraints

This PR should stay eligible for W6d automerge only while every changed file remains in the safe state/docs scope and Patchwarden exact-head evidence is green.

Explicit out-of-scope

No code changes, no policy expansion, no security-sensitive merge, no controller retry-loop implementation.

Requested decision

Expected readiness verdict after checks: ready_for_controller_merge. Expected final action: trusted automerge-pilot workflow approval/merge through its runner-local merge actor.

Merge blockers

Any file outside W6d safe scope.
Missing/stale exact-head Patchwarden/status evidence.
Any security-sensitive classification.

Verification

git diff --check → clean.
Changed path is only state/cycle/W6d-controller-selfmerge-smoke-2026-06-25.md.

Spec sources read

docs/forgejo-agent-operations.md — W6d/Patchwarden automerge contract.
state/cycle/W6d-autonomous-merge-pilot.md — W6d policy notes.
#823, #824, #825 — current goal and preceding attempts.

Refs #823

Canary status: not required — W6d safe-scope state/cycle self-merge smoke ## Canary Context Pack ### Product story This is the follow-up to #825: prove that a boring safe-scope PR can pass Patchwarden and then be merged by the autonomous controller instead of by Piotr/manual merge. ### What changed Added one state-only W6d self-merge smoke note under `state/cycle/`. ### Why it changed Issue #823 acceptance still needs a PR that actually goes through the controller merge path after Patchwarden passes. ### Files touched - `state/cycle/W6d-controller-selfmerge-smoke-2026-06-25.md` ### Relevant context - #823 — Patchwarden unattended merge-safety loop. - #824 — readiness artifacts emit controller verdicts and exact-head merge actor guards. - #825 — first dogfood PR, manually merged by operator before self-merge could be tested. - `docs/forgejo-agent-operations.md` Autonomous Merge Readiness v0. ### Runtime evidence No runtime mutation. No deploy. No secrets. No branch protection, DNS, auth, ingress, routing, public exposure, or workflow change. ### Known constraints This PR should stay eligible for W6d automerge only while every changed file remains in the safe state/docs scope and Patchwarden exact-head evidence is green. ### Explicit out-of-scope No code changes, no policy expansion, no security-sensitive merge, no controller retry-loop implementation. ### Requested decision Expected readiness verdict after checks: `ready_for_controller_merge`. Expected final action: trusted `automerge-pilot` workflow approval/merge through its runner-local merge actor. ### Merge blockers - Any file outside W6d safe scope. - Missing/stale exact-head Patchwarden/status evidence. - Any security-sensitive classification. ## Verification - `git diff --check` → clean. - Changed path is only `state/cycle/W6d-controller-selfmerge-smoke-2026-06-25.md`. ## Spec sources read - `docs/forgejo-agent-operations.md` — W6d/Patchwarden automerge contract. - `state/cycle/W6d-autonomous-merge-pilot.md` — W6d policy notes. - #823, #824, #825 — current goal and preceding attempts. Refs #823

codex added the

automerge-candidate

W6d-automerge-calibration

agent/codex

judge/patchwarden-candidate

labels

2026-06-25 15:54:31 +02:00

codex added 1 commit

2026-06-25 15:54:31 +02:00

docs(w6d): smoke controller self-merge path

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

Details

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

Details

patchwarden-client-dry-run / collect-diff (pull_request) Successful in 4s

Details

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

Details

canary-required / canary (pull_request) Has been skipped

Details

patchwarden-client-dry-run / dry-run (pull_request) Successful in 24s

Details

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

Details

aaa5771a53

patchwarden commented

2026-06-25 15:55:12 +02:00

First-time contributor

No Patchwarden findings to render.

patchwarden commented

2026-06-25 15:55:48 +02:00

First-time contributor

Patchwarden PR sanity

Verdict: PASS WITH DEGRADED REVIEWER HEALTH - deterministic checks are clean, but this is not an approval signal.

Next step: Rerun PR sanity or inspect the degraded reviewer lane before unattended merge.

PR: 826
Commit: 6223226300e048cfa2c7796fd37ff43fb409b2d4
Status: eligible_sanity_clean
Reviewer health: degraded
Security-sensitive label: missing
Authority: Patchwarden policy signal; branch protection and automerge controller remain merge authority.
Model mix: glm-5.2:cloud, deepseek-v4-pro:cloud, kimi-k2.7:cloud

What I checked

Changed files: 1
Deterministic blocker scan: clean
Model reviewer lanes: 3
Comment contract: this comment is updated in place via a hidden Patchwarden marker.

Approval Handoff

State: not_ready_degraded_reviewer_health
Action: rerun PR sanity or inspect the degraded reviewer lane before any unattended approval.
Boundary: branch protection and the automerge controller remain merge authority.

Required Fixes

No deterministic blockers.

Reviewer Details

Model reviewer lanes

`global-glm` / `glm-5.2:cloud`

Status: ok
Verdict: OK
Findings: none

`global-deepseek` / `deepseek-v4-pro:cloud`

Status: ok
Verdict: OK
Findings: none

`redteam` / `kimi-k2.7:cloud`

Status: error
Verdict: -
Note: Ollama HTTP 404: {"error": "model 'kimi-k2.7:cloud' not found"}
Findings: none

Policy notes

Patchwarden PR sanity is the first merge-lane signal for this PR.
Models produce findings; Patchwarden/policy produces decisions.
Model findings alone do not fail the status check; they require human or agent disposition.
Formal approval is separate from this comment and requires clean reviewer health.
Automerge remains delegated to branch protection and the automerge pilot.

# Patchwarden PR sanity **Verdict:** PASS WITH DEGRADED REVIEWER HEALTH - deterministic checks are clean, but this is not an approval signal. **Next step:** Rerun PR sanity or inspect the degraded reviewer lane before unattended merge. - PR: `826` - Commit: `6223226300e048cfa2c7796fd37ff43fb409b2d4` - Status: `eligible_sanity_clean` - Reviewer health: `degraded` - Security-sensitive label: `missing` - Authority: Patchwarden policy signal; branch protection and automerge controller remain merge authority. - Model mix: `glm-5.2:cloud`, `deepseek-v4-pro:cloud`, `kimi-k2.7:cloud` ## What I checked - Changed files: `1` - Deterministic blocker scan: `clean` - Model reviewer lanes: `3` - Comment contract: this comment is updated in place via a hidden Patchwarden marker. ## Approval Handoff - State: `not_ready_degraded_reviewer_health` - Action: rerun PR sanity or inspect the degraded reviewer lane before any unattended approval. - Boundary: branch protection and the automerge controller remain merge authority. ## Required Fixes No deterministic blockers. ## Reviewer Details <details> <summary>Model reviewer lanes</summary> ### `global-glm` / `glm-5.2:cloud` - Status: `ok` - Verdict: `OK` - Findings: none ### `global-deepseek` / `deepseek-v4-pro:cloud` - Status: `ok` - Verdict: `OK` - Findings: none ### `redteam` / `kimi-k2.7:cloud` - Status: `error` - Verdict: `-` - Note: Ollama HTTP 404: {"error": "model 'kimi-k2.7:cloud' not found"} - Findings: none </details> ## Policy notes - Patchwarden PR sanity is the first merge-lane signal for this PR. - Models produce findings; Patchwarden/policy produces decisions. - Model findings alone do not fail the status check; they require human or agent disposition. - Formal approval is separate from this comment and requires clean reviewer health. - Automerge remains delegated to branch protection and the automerge pilot.

codex referenced this pull request

2026-06-25 20:53:02 +02:00

fix(automerge): tolerate stale read token in collect #827

codex referenced this pull request

2026-06-25 21:03:26 +02:00

goal(patchwarden): enable unattended merge-safety loop for eligible Platform PRs #823

ollama added 1 commit

2026-06-25 21:35:21 +02:00

Merge remote-tracking branch 'origin/main' into codex/issue-823-automerge-selfmerge-smoke

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

Details

canary-required / canary (pull_request) Has been skipped

Details

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

Details

patchwarden-client-dry-run / collect-diff (pull_request) Successful in 4s

Details

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

Details

patchwarden-client-dry-run / dry-run (pull_request) Successful in 57s

Details

patchwarden-pr-sanity / sanity (pull_request) Successful in 1m22s

Details

3b1d252a97

patchwarden commented

2026-06-25 21:36:14 +02:00

First-time contributor

No Patchwarden findings to render.

codex commented

2026-06-25 21:43:41 +02:00

Author

Collaborator

Status update from codex, 2026-06-25:

#826 was refreshed on top of #827 and rechecked at head 3b1d252a97f18934d7385fffb16aea4ab8272aa0.

Evidence from automerge-pilot run #5944:

Collect Forgejo facts: passed via token_env=GITHUB_TOKEN, proving #827 fixed the stale read-token blocker.
automerge_readiness.py: ready_for_controller_merge, ready=true.
Iskra Matrix approval: approved=true for PR #826 and exact head SHA.
Final merge actor: failed at /api/v1/user with HTTP 401 while loading PLATFORM_AUTOMERGE_BOT_TOKEN.

Interpretation: the remaining blocker is runner-local merge-bot credential validity, not PR readiness and not Patchwarden. I did not bypass this with codex/operator/GITHUB_TOKEN, because the W6d contract requires a separate non-cousin merge actor.

Next exact step: refresh/restore the runner-local PLATFORM_AUTOMERGE_BOT_TOKEN for the W6d merge-bot identity, then rerun automerge-pilot for #826 with execute_merge=true and confirm=AUTOMERGE_READY_W6D.

Status update from codex, 2026-06-25: #826 was refreshed on top of #827 and rechecked at head `3b1d252a97f18934d7385fffb16aea4ab8272aa0`. Evidence from `automerge-pilot` run #5944: - `Collect Forgejo facts`: passed via `token_env=GITHUB_TOKEN`, proving #827 fixed the stale read-token blocker. - `automerge_readiness.py`: `ready_for_controller_merge`, `ready=true`. - Iskra Matrix approval: `approved=true` for PR #826 and exact head SHA. - Final merge actor: failed at `/api/v1/user` with HTTP 401 while loading `PLATFORM_AUTOMERGE_BOT_TOKEN`. Interpretation: the remaining blocker is runner-local merge-bot credential validity, not PR readiness and not Patchwarden. I did not bypass this with codex/operator/GITHUB_TOKEN, because the W6d contract requires a separate non-cousin merge actor. Next exact step: refresh/restore the runner-local `PLATFORM_AUTOMERGE_BOT_TOKEN` for the W6d merge-bot identity, then rerun `automerge-pilot` for #826 with `execute_merge=true` and `confirm=AUTOMERGE_READY_W6D`.

codex referenced this pull request

2026-06-25 21:43:42 +02:00

goal(patchwarden): enable unattended merge-safety loop for eligible Platform PRs #823