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

New issue

Closed

opened 2026-07-15 06:19:26 +00:00 by coilyco-ops · 3 comments

coilyco-ops commented

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

Member

Problem

Both retrigger PRs for #553 are green and mergeable but hit Forgejo 500 on merge because they carry empty/no-op commits with no file diff.

Evidence from the director heartbeat on 2026-07-15:

PR #555: green and mergeable, but ward agent pr merge returned Forgejo 500 twice.
Follow-up issue #556 produced replacement PR #557.
PR #557 is also green/mergeable, but it has changed_files: 0, additions: 0, deletions: 0.
Merging #557 also returns Forgejo 500.

Task

Create a replacement PR for #553 that retriggers the promote flow with a tiny real file change instead of an empty commit.

Preferred shape:

Make the smallest harmless tracked-file change that is acceptable in agentic-os, such as a dated note in an existing operational/release note file or another repo-approved no-op text touch.
Preserve the intent: get a normal merge commit/push on main so promote can advance release.
Close or supersede #555 and #557 with clear evidence once the replacement exists.

Acceptance criteria

Replacement PR has changed_files > 0.
PR CI is green.
Director can merge it through the PR workflow.
The resulting main push starts promote and release advancement evidence is left on #553 or the replacement issue.
No direct push to main.

## Problem Both retrigger PRs for #553 are green and mergeable but hit Forgejo 500 on merge because they carry empty/no-op commits with no file diff. Evidence from the director heartbeat on 2026-07-15: * PR #555: green and mergeable, but `ward agent pr merge` returned Forgejo 500 twice. * Follow-up issue #556 produced replacement PR #557. * PR #557 is also green/mergeable, but it has `changed_files: 0`, `additions: 0`, `deletions: 0`. * Merging #557 also returns Forgejo 500. ## Task Create a replacement PR for #553 that retriggers the promote flow with a tiny real file change instead of an empty commit. Preferred shape: * Make the smallest harmless tracked-file change that is acceptable in `agentic-os`, such as a dated note in an existing operational/release note file or another repo-approved no-op text touch. * Preserve the intent: get a normal merge commit/push on main so promote can advance `release`. * Close or supersede #555 and #557 with clear evidence once the replacement exists. ## Acceptance criteria * Replacement PR has `changed_files > 0`. * PR CI is green. * Director can merge it through the PR workflow. * The resulting main push starts promote and release advancement evidence is left on #553 or the replacement issue. * No direct push to main.

coilyco-ops commented

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

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

Holder: launch intent for container engineer-codex-agentic-os-558 on host c6d9c6c08ebe.

Accepted by ward agent --harness codex (reserved 2026-07-15T06:20:59Z). 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#558 · branch issue-558 · harness codex · workflow pull-request-and-merge
Run: engineer-codex-agentic-os-558 · ward v0.697.0 · dispatched 2026-07-15T06:20:57Z
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-558` on host `c6d9c6c08ebe`. Accepted by `ward agent --harness codex` (reserved 2026-07-15T06:20:59Z). 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#558` · branch `issue-558` · harness `codex` · workflow `pull-request-and-merge` - **Run:** `engineer-codex-agentic-os-558` · ward `v0.697.0` · dispatched `2026-07-15T06:20:57Z` - **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:23:06 +00:00

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

Holder: launch intent for container engineer-codex-agentic-os-558 on host c6d9c6c08ebe.

Accepted by ward agent --harness codex (reserved 2026-07-15T06:23:06Z). 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.

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

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

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-558` on host `c6d9c6c08ebe`. Accepted by `ward agent --harness codex` (reserved 2026-07-15T06:23:06Z). 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#558` · branch `issue-558` · harness `codex` · workflow `pull-request-and-merge` - **Run:** `engineer-codex-agentic-os-558` · ward `v0.697.0` · dispatched `2026-07-15T06:23:01Z` - **Comment thread:** 0 included in the pre-flight read, 1 stripped (ward's own automated comments). - stripped: @coilyco-ops (2026-07-15T06:20:59Z) 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:32:36 +00:00

Author

Member

Superseded by #559/#560. The non-empty replacement PR #560 had changed_files=1, passed ci / ward-doctor and ci / gate, and merged at 2026-07-15T06:31:51Z as 802b77ddc7. The empty-diff PR #557 was closed as superseded.

Superseded by #559/#560. The non-empty replacement PR #560 had changed_files=1, passed ci / ward-doctor and ci / gate, and merged at 2026-07-15T06:31:51Z as 802b77ddc7735a44899c28dcc6860b3821aeef88. The empty-diff PR #557 was closed as superseded.

coilyco-ops closed this issue

2026-07-15 06:32:40 +00:00