Repair green PR 1332 blocked by Forgejo merge 405 #1333

New issue

Closed

opened 2026-07-15 06:28:20 +00:00 by coilyco-ops · 3 comments

coilyco-ops commented

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

Member

Problem

PR #1332 is green on head 38c9dc491443f06f1365928e7b30d11176a8a1c8, but the native director merge path cannot land it.

Evidence from the 2026-07-15 director heartbeat:

ward agent pr status coilyco-flight-deck/ward#1332 reports combined status success.
ward agent pr merge coilyco-flight-deck/ward#1332 through the broker returned Forgejo 405 after three settle attempts.
The local in-process merge path with WARD_DISPATCH_BROKER_* unset returned the same 405.
Forgejo still reports the PR as mergeable: false, despite green CI.

Task

Repair or replace PR #1332 so the human-feedback gate work can land through the normal PR workflow.

Preferred shape:

Rebase or recreate the branch against current main if the 405 is caused by stale/non-mergeable PR state.
Preserve the #1275 behavior and tests from PR #1332.
Leave a green, mergeable PR for director merge.
Supersede/close PR #1332 with evidence if a replacement PR is needed.

Acceptance criteria

Replacement/current PR has changed_files > 0.
Combined status is success.
Forgejo merge succeeds through ward agent pr merge.
No direct push to main.

## Problem PR #1332 is green on head `38c9dc491443f06f1365928e7b30d11176a8a1c8`, but the native director merge path cannot land it. Evidence from the 2026-07-15 director heartbeat: * `ward agent pr status coilyco-flight-deck/ward#1332` reports combined status success. * `ward agent pr merge coilyco-flight-deck/ward#1332` through the broker returned Forgejo 405 after three settle attempts. * The local in-process merge path with `WARD_DISPATCH_BROKER_*` unset returned the same 405. * Forgejo still reports the PR as `mergeable: false`, despite green CI. ## Task Repair or replace PR #1332 so the human-feedback gate work can land through the normal PR workflow. Preferred shape: * Rebase or recreate the branch against current `main` if the 405 is caused by stale/non-mergeable PR state. * Preserve the #1275 behavior and tests from PR #1332. * Leave a green, mergeable PR for director merge. * Supersede/close PR #1332 with evidence if a replacement PR is needed. ## Acceptance criteria * Replacement/current PR has `changed_files > 0`. * Combined status is success. * Forgejo merge succeeds through `ward agent pr merge`. * No direct push to `main`.

coilyco-ops commented

2026-07-15 06:29:10 +00:00

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

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

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

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

Author

Member

WARDED_WORKFLOW: #1337

details

workflow: pull-request-and-merge; review summary: review gate skipped by ~/.ward/config.yaml default
review gate intentionally skipped because temporary ward default pending brokered QA; the replacement PR was rebased, merged, and the stale PR 1332 was closed as superseded.
felt: mostly mechanical once the stale mergeability state was replaced with a clean rebase; confidence: high; surprise: Forgejo 405 was stale PR state rather than a code regression; follow-up: none beyond keeping the landed PR green.

WARDED_WORKFLOW: https://forgejo.coilysiren.me/coilyco-flight-deck/ward/pulls/1337 <details><summary>details</summary> workflow: pull-request-and-merge; review summary: review gate skipped by ~/.ward/config.yaml default review gate intentionally skipped because temporary ward default pending brokered QA; the replacement PR was rebased, merged, and the stale PR 1332 was closed as superseded. felt: mostly mechanical once the stale mergeability state was replaced with a clean rebase; confidence: high; surprise: Forgejo 405 was stale PR state rather than a code regression; follow-up: none beyond keeping the landed PR green. </details>

coilyco-ops commented

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

Author

Member

Resolved by replacement PR #1337, merged at 2026-07-15T06:36:19Z as 181348b70e. The superseded green-but-405 PR #1332 is closed.

Resolved by replacement PR #1337, merged at 2026-07-15T06:36:19Z as 181348b70e7175582ce1c9ba1e09e6ce9d38d0ef. The superseded green-but-405 PR #1332 is closed.

coilyco-ops closed this issue

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