Resolve conflict between dev-base retry fix and retag wait #578

New issue

Closed

opened 2026-07-15 09:34:49 +00:00 by coilyco-ops · 2 comments

coilyco-ops commented

2026-07-15 09:34:49 +00:00

Member

PR #577 (fix(dev-base): resume publish retry on current main) is the replacement for stale PR #567, but it still cannot land after #574.

Evidence:

PR #577 head 9a00ef17460265094cde956b01a58275ea73631b has green PR checks: ci / gate and ci / ward-doctor.
PR #577 merge base is d1ca18e7e53ed1918f0f0571f374a53985a21ed9; current main is 1f23e03671aa1603ecffdc5951b0c545e40807d7 from #574 (Gate release retagging on draft image availability).
ward agent pr merge coilyco-flight-deck/agentic-os#577 failed with Forgejo 405 while the PR stayed green.
ward ops forgejo pr update coilyco-flight-deck agentic-os 577 failed with 409: merge failed because of conflict.
The active release blocker remains dev-base-publish.yml: release run 1408 failed in publish-core, step ./actions/publish-dev-base-tier, after 14m27s.

The engineer should resolve the conflict between #577 and #574, preserving both behaviors: retry/resume for dev-base publish and release retag waiting for draft image availability. Update #577 if practical; otherwise open a replacement PR and clearly mark #577 superseded.

Acceptance:

A mergeable PR exists against current main containing both #574 behavior and the dev-base publish retry/resume fix.
PR CI is green.
The issue thread states whether #577 was updated or superseded.
The active release path can proceed to a new promote and release publish attempt after merge.

PR #577 (`fix(dev-base): resume publish retry on current main`) is the replacement for stale PR #567, but it still cannot land after #574. Evidence: * PR #577 head `9a00ef17460265094cde956b01a58275ea73631b` has green PR checks: `ci / gate` and `ci / ward-doctor`. * PR #577 merge base is `d1ca18e7e53ed1918f0f0571f374a53985a21ed9`; current main is `1f23e03671aa1603ecffdc5951b0c545e40807d7` from #574 (`Gate release retagging on draft image availability`). * `ward agent pr merge coilyco-flight-deck/agentic-os#577` failed with Forgejo 405 while the PR stayed green. * `ward ops forgejo pr update coilyco-flight-deck agentic-os 577` failed with 409: `merge failed because of conflict`. * The active release blocker remains `dev-base-publish.yml`: release run `1408` failed in `publish-core`, step `./actions/publish-dev-base-tier`, after 14m27s. The engineer should resolve the conflict between #577 and #574, preserving both behaviors: retry/resume for dev-base publish and release retag waiting for draft image availability. Update #577 if practical; otherwise open a replacement PR and clearly mark #577 superseded. Acceptance: * A mergeable PR exists against current main containing both #574 behavior and the dev-base publish retry/resume fix. * PR CI is green. * The issue thread states whether #577 was updated or superseded. * The active release path can proceed to a new promote and release publish attempt after merge.

coilyco-ops commented

2026-07-15 09:35:06 +00:00

Author

Member

WARDED_WORKFLOW: reservation-held

reservation details

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

Accepted by ward agent --harness codex (reserved 2026-07-15T09:35: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).

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

Resolved: coilyco-flight-deck/agentic-os#578 · branch issue-578 · harness codex · workflow pull-request-and-merge
Run: engineer-codex-agentic-os-578 · ward v0.697.0 · dispatched 2026-07-15T09:35:01Z
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-578` on host `kais-macbook-pro-2.local`. Accepted by `ward agent --harness codex` (reserved 2026-07-15T09:35: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#578` · branch `issue-578` · harness `codex` · workflow `pull-request-and-merge` - **Run:** `engineer-codex-agentic-os-578` · ward `v0.697.0` · dispatched `2026-07-15T09:35:01Z` - **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 09:45:17 +00:00

fix(dev-base): resolve publish retry and retag wait #579

coilyco-ops commented

2026-07-15 09:46:37 +00:00

Author

Member

WARDED_WORKFLOW: #579

details

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

PR #577 was superseded by PR #579. The implementation felt like a straight rebase with one real merge point in the helper script. Confidence is high after the targeted tests and pre-commit passed. The only surprise was the manifest probe fallback needing a stdout guard for the mocked tests.

Follow-up: director merge on the PR.

WARDED_WORKFLOW: https://forgejo.coilysiren.me/coilyco-flight-deck/agentic-os/pulls/579 <details><summary>details</summary> workflow: pull-request-and-merge; review summary: skipped intentionally because the temporary ward default pending brokered QA PR #577 was superseded by PR #579. The implementation felt like a straight rebase with one real merge point in the helper script. Confidence is high after the targeted tests and pre-commit passed. The only surprise was the manifest probe fallback needing a stdout guard for the mocked tests. Follow-up: director merge on the PR. </details>

coilyco-ops closed this issue

2026-07-15 09:46:47 +00:00

coilyco-ops referenced this issue

2026-07-15 09:47:59 +00:00

Repair post-merge CI failure after dev-base publish recovery #580

coilyco-ops referenced this issue

2026-07-15 10:10:27 +00:00

Fix publish-core failure after retry and retag wait fixes #581