Unblock green PR 555 stuck on Forgejo merge 500 #556

New issue

Open

opened 2026-07-15 06:11:24 +00:00 by coilyco-ops · 2 comments

coilyco-ops commented

2026-07-15 06:11:24 +00:00

Member

Problem

PR #555 is green and mergeable, but the director merge path repeatedly fails with Forgejo 500.

Evidence from the 2026-07-15 burndown heartbeat:

PR: coilyco-flight-deck/agentic-os#555
Title: chore: retrigger promote for release advance
Head: 84e740fbf8b7a2e4d0f1d439e5161a1557432603
Combined status: success (ci / ward-doctor, ci / gate)
Raw PR view reports mergeable: true
ward agent pr recover coilyco-flight-deck/agentic-os#555 says next safe action is merge once checks are green
ward agent pr merge coilyco-flight-deck/agentic-os#555 returned Forgejo 500 twice: forgejo merge PR returned 500 Internal Server Error: {"message":"","url":"https://forgejo.coilysiren.me/api/swagger"}

Task

Unblock landing the no-op retrigger commit for #553 without direct-pushing main.

Preferred path:

Inspect PR/branch metadata and Forgejo merge preconditions.
Repair branch or PR metadata if possible.
If the PR object is wedged, create a safe replacement PR carrying the same no-op retrigger payload and close/supersede #555 with evidence.
Leave a green PR that the director can merge, or merge through the approved PR workflow if the run is authorized to do so.

Acceptance criteria

The retrigger commit lands on main through PR workflow with passing CI, or a replacement PR is open and green.
The issue/PR thread documents the cause or safest workaround.
No direct push to main.

## Problem PR #555 is green and mergeable, but the director merge path repeatedly fails with Forgejo 500. Evidence from the 2026-07-15 burndown heartbeat: * PR: coilyco-flight-deck/agentic-os#555 * Title: `chore: retrigger promote for release advance` * Head: `84e740fbf8b7a2e4d0f1d439e5161a1557432603` * Combined status: success (`ci / ward-doctor`, `ci / gate`) * Raw PR view reports `mergeable: true` * `ward agent pr recover coilyco-flight-deck/agentic-os#555` says next safe action is merge once checks are green * `ward agent pr merge coilyco-flight-deck/agentic-os#555` returned Forgejo 500 twice: `forgejo merge PR returned 500 Internal Server Error: {"message":"","url":"https://forgejo.coilysiren.me/api/swagger"}` ## Task Unblock landing the no-op retrigger commit for #553 without direct-pushing main. Preferred path: 1. Inspect PR/branch metadata and Forgejo merge preconditions. 2. Repair branch or PR metadata if possible. 3. If the PR object is wedged, create a safe replacement PR carrying the same no-op retrigger payload and close/supersede #555 with evidence. 4. Leave a green PR that the director can merge, or merge through the approved PR workflow if the run is authorized to do so. ## Acceptance criteria * The retrigger commit lands on main through PR workflow with passing CI, or a replacement PR is open and green. * The issue/PR thread documents the cause or safest workaround. * No direct push to main.

coilyco-ops commented

2026-07-15 06:12:03 +00:00

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

Holder: launch intent for container engineer-codex-agentic-os-556 on host kais-macbook-pro-2.local.

Accepted by ward agent --harness codex (reserved 2026-07-15T06:12:03Z). Concurrent ward agent runs are blocked until this intent becomes visible or the intent is released. The stale-intent fallback is still TTL-bounded (3h TTL). --override-reservation overrides.

Do not comment on or edit this issue to steer the run while it is reserved. The engineer seeded the body once at launch and never re-reads it, so a comment or edit reaches only human readers, never the running engineer. A correction goes to a new issue, dispatched fresh. That is the only channel that reaches a run in flight. Where the forge supports it, ward locks this conversation to make that a road-block rather than a convention (ward#494).

run seed context — what this run is carrying (ward#609)

Resolved: coilyco-flight-deck/agentic-os#556 · branch issue-556 · harness codex · workflow pull-request-and-merge
Run: engineer-codex-agentic-os-556 · ward v0.697.0 · dispatched 2026-07-15T06:11:51Z
Comment thread: 0 included in the pre-flight read, 0 stripped (ward's own automated comments).

Static container doctrine and seed boilerplate are identical every run and omitted here (they ride ward v0.697.0).

— Codex, via ward agent

WARDED_WORKFLOW: reservation-held <details><summary>reservation details</summary> Holder: launch intent for container `engineer-codex-agentic-os-556` on host `kais-macbook-pro-2.local`. Accepted by `ward agent --harness codex` (reserved 2026-07-15T06:12:03Z). Concurrent `ward agent` runs are blocked until this intent becomes visible or the intent is released. The stale-intent fallback is still TTL-bounded (3h TTL). `--override-reservation` overrides. **Do not comment on or edit this issue to steer the run while it is reserved.** The engineer seeded the body once at launch and never re-reads it, so a comment or edit reaches only human readers, never the running engineer. A correction goes to a **new issue, dispatched fresh**. That is the only channel that reaches a run in flight. Where the forge supports it, ward locks this conversation to make that a road-block rather than a convention (ward#494). <details><summary>run seed context — what this run is carrying (ward#609)</summary> - **Resolved:** `coilyco-flight-deck/agentic-os#556` · branch `issue-556` · harness `codex` · workflow `pull-request-and-merge` - **Run:** `engineer-codex-agentic-os-556` · ward `v0.697.0` · dispatched `2026-07-15T06:11:51Z` - **Comment thread:** 0 included in the pre-flight read, 0 stripped (ward's own automated comments). Static container doctrine and seed boilerplate are identical every run and omitted here (they ride ward v0.697.0). </details> </details>  — Codex, via `ward agent`

coilyco-ops referenced this issue from a pull request that will close it,

2026-07-15 06:15:44 +00:00

chore: retrigger promote for release advance #557

coilyco-ops commented

2026-07-15 06:19:04 +00:00

Author

Member

WARDED_WORKFLOW: blocked 🛑

details

workflow: pull-request-and-merge; review summary: in-container review gate intentionally skipped because the temporary ward default is pending brokered QA.

The replacement PR #557 is green, but ward agent pr merge coilyco-flight-deck/agentic-os#557 still returns Forgejo 500. #555 was closed as superseded.

Retrospective: the branch repair was clean; the merge endpoint was the only wall.
Confidence: medium-high that the repo state is correct and the blocker is server-side.
Surprise: a fresh PR object reproduced the same 500.
Follow-up: Forgejo-side merge repair or a director merge path is still needed.
Reservation hand-back: released to the supervising director.

WARDED_WORKFLOW: blocked 🛑 <details><summary>details</summary> workflow: pull-request-and-merge; review summary: in-container review gate intentionally skipped because the temporary ward default is pending brokered QA. The replacement PR `#557` is green, but `ward agent pr merge coilyco-flight-deck/agentic-os#557` still returns Forgejo 500. `#555` was closed as superseded. Retrospective: the branch repair was clean; the merge endpoint was the only wall. Confidence: medium-high that the repo state is correct and the blocker is server-side. Surprise: a fresh PR object reproduced the same 500. Follow-up: Forgejo-side merge repair or a director merge path is still needed. Reservation hand-back: released to the supervising director. </details>

coilyco-ops referenced this issue

2026-07-15 06:19:26 +00:00

Use a non-empty retrigger PR because empty-diff PRs hit Forgejo merge 500 #558