Unblock green PR 1325 stuck on Forgejo merge 500 #1330

New issue

Closed

opened 2026-07-15 05:56:32 +00:00 by coilyco-ops · 3 comments

coilyco-ops commented

2026-07-15 05:56:32 +00:00

Member

Problem

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

Evidence from the 2026-07-15 burndown heartbeat:

PR: coilyco-flight-deck/ward#1325
Title: Fix smart-defaults generated asset drift after defaults source change
Current head after repair: 63d3131bb71838f5b84fe2974a95f21dba4abc5a
Combined status: success (test / test (pull_request)=success)
Raw PR view reports mergeable: true
ward agent pr merge coilyco-flight-deck/ward#1325 repeatedly returns: forgejo merge PR returned 500 Internal Server Error: {"message":"","url":"https://forgejo.coilysiren.me/api/swagger"}
A suspected self-closing trailer in the PR body (closes #1325) was corrected to closes #1321, but the merge endpoint still returns 500.

Task

Diagnose and unblock the PR without losing the smart-defaults drift fix.

Preferred path:

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

Acceptance criteria

The smart-defaults drift fix lands on main with passing CI, or a replacement PR is open and green.
The issue/PR thread documents the actual cause or the safest evidence-backed workaround.
No direct push to main; preserve the PR-gated flow.

## Problem PR #1325 is green and mergeable, but the native director merge path repeatedly fails with Forgejo 500. Evidence from the 2026-07-15 burndown heartbeat: * PR: coilyco-flight-deck/ward#1325 * Title: `Fix smart-defaults generated asset drift after defaults source change` * Current head after repair: `63d3131bb71838f5b84fe2974a95f21dba4abc5a` * Combined status: success (`test / test (pull_request)=success`) * Raw PR view reports `mergeable: true` * `ward agent pr merge coilyco-flight-deck/ward#1325` repeatedly returns: `forgejo merge PR returned 500 Internal Server Error: {"message":"","url":"https://forgejo.coilysiren.me/api/swagger"}` * A suspected self-closing trailer in the PR body (`closes #1325`) was corrected to `closes #1321`, but the merge endpoint still returns 500. ## Task Diagnose and unblock the PR without losing the smart-defaults drift fix. Preferred path: 1. Inspect the PR/branch state and Forgejo merge preconditions. 2. Repair branch or PR metadata if possible. 3. If the PR object itself is wedged, create a safe replacement PR from the same payload and close/supersede #1325 with evidence. 4. Leave a green PR that the director can merge, or merge through the approved workflow if the run is authorized to do so. ## Acceptance criteria * The smart-defaults drift fix lands on main with passing CI, or a replacement PR is open and green. * The issue/PR thread documents the actual cause or the safest evidence-backed workaround. * No direct push to main; preserve the PR-gated flow.

coilyco-ops commented

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

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

Holder: launch intent for container engineer-codex-ward-1330 on host kais-macbook-pro-2.local.

Accepted by ward agent --harness codex (reserved 2026-07-15T06:00:50Z). 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/ward#1330 · branch issue-1330 · harness codex · workflow pull-request-and-merge
Run: engineer-codex-ward-1330 · ward v0.697.0 · dispatched 2026-07-15T06:00:33Z
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-ward-1330` on host `kais-macbook-pro-2.local`. Accepted by `ward agent --harness codex` (reserved 2026-07-15T06:00:50Z). 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/ward#1330` · branch `issue-1330` · harness `codex` · workflow `pull-request-and-merge` - **Run:** `engineer-codex-ward-1330` · ward `v0.697.0` · dispatched `2026-07-15T06:00:33Z` - **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`

coilysiren commented

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

Owner

that specific PR was just broken

coilysiren closed this issue

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

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

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

Unblock Forgejo merge 500 on empty-diff PRs #1331

coilyco-ops commented

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

Author

Member

WARDED_WORKFLOW: #1331

details

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

The live PR #1325 had already collapsed to an empty diff against main, so the no-op merge path was the real failure mode behind the Forgejo 500.

felt: straightforward once the stale branch-tree state was isolated.
confidence: high
surprise: the original PR object was empty against main, so the fix was already landed and only the merge path was wedged.
follow-up: close/supersede #1325 with the evidence if it still remains open.

WARDED_WORKFLOW: https://forgejo.coilysiren.me/coilyco-flight-deck/ward/pulls/1331 <details><summary>details</summary> workflow: pull-request-and-merge; review summary: review gate intentionally skipped because the temporary ward default pending brokered QA The live PR #1325 had already collapsed to an empty diff against main, so the no-op merge path was the real failure mode behind the Forgejo 500. felt: straightforward once the stale branch-tree state was isolated. confidence: high surprise: the original PR object was empty against main, so the fix was already landed and only the merge path was wedged. follow-up: close/supersede #1325 with the evidence if it still remains open. </details>