Add merge-style support to ward agent pr merge #1202

New issue

Closed

opened 2026-07-13 21:59:06 +00:00 by coilyco-ops · 2 comments

coilyco-ops commented

2026-07-13 21:59:06 +00:00

Member

The native ward agent pr merge path needs merge-style support. The immediate gap is that the command has no --style flag, so the director cannot request squash when a repository disallows merge commits.

Live failure on 2026-07-13:

ward agent pr status coilyco-flight-deck/agentic-os#506 reported combined status success for both required contexts.
ward agent pr merge coilyco-flight-deck/agentic-os#506 failed with forgejo merge PR returned 405 Method Not Allowed: {"message":"merge is not an allowed merge style for this repository"}.
The target repo settings only allow squash and fast-forward-only, with default_merge_style: squash.
The workaround was a direct Forgejo API call with Do: squash and head_commit_id pinned to the green PR head SHA.

Required behavior:

Add a --style flag to ward agent pr merge that maps to Forgejo MergePullRequestOption.Do values, including at least merge, squash, fast-forward-only, rebase, and rebase-merge.
If --style is omitted, read the target repo allowed/default merge settings and use the repo default when it is allowed.
If neither an explicit style nor a usable repo default exists, fail with an error naming the allowed styles and the missing setting.
Preserve existing gates: status must be green, the PR head must be pinned, workflow authorization must still pass, and already-merged checks must remain idempotent.
Keep branch deletion behavior aligned with the repository default unless ward already has a more specific policy.

Acceptance:

Tests cover an explicit --style squash merge.
Tests cover an omitted style on a repo that disallows merge commits and defaults to squash.
Tests cover an unsupported explicit style with a clear error.
ward agent pr merge --style squash <owner/repo#N> succeeds for a green PR in a squash-only repo.

Related live PR: coilyco-flight-deck/agentic-os#506

The native `ward agent pr merge` path needs merge-style support. The immediate gap is that the command has no `--style` flag, so the director cannot request `squash` when a repository disallows merge commits. Live failure on 2026-07-13: - `ward agent pr status coilyco-flight-deck/agentic-os#506` reported combined status success for both required contexts. - `ward agent pr merge coilyco-flight-deck/agentic-os#506` failed with `forgejo merge PR returned 405 Method Not Allowed: {"message":"merge is not an allowed merge style for this repository"}`. - The target repo settings only allow squash and fast-forward-only, with `default_merge_style: squash`. - The workaround was a direct Forgejo API call with `Do: squash` and `head_commit_id` pinned to the green PR head SHA. Required behavior: - Add a `--style` flag to `ward agent pr merge` that maps to Forgejo `MergePullRequestOption.Do` values, including at least `merge`, `squash`, `fast-forward-only`, `rebase`, and `rebase-merge`. - If `--style` is omitted, read the target repo allowed/default merge settings and use the repo default when it is allowed. - If neither an explicit style nor a usable repo default exists, fail with an error naming the allowed styles and the missing setting. - Preserve existing gates: status must be green, the PR head must be pinned, workflow authorization must still pass, and already-merged checks must remain idempotent. - Keep branch deletion behavior aligned with the repository default unless ward already has a more specific policy. Acceptance: - Tests cover an explicit `--style squash` merge. - Tests cover an omitted style on a repo that disallows merge commits and defaults to squash. - Tests cover an unsupported explicit style with a clear error. - `ward agent pr merge --style squash <owner/repo#N>` succeeds for a green PR in a squash-only repo. Related live PR: https://forgejo.coilysiren.me/coilyco-flight-deck/agentic-os/pulls/506

coilyco-ops changed title from ~~Honor repository merge style in ward agent pr merge~~ to Add merge-style support to ward agent pr merge

2026-07-13 22:04:22 +00:00

coilysiren referenced this issue

2026-07-13 22:09:01 +00:00

Allow for a default merge style in KDL #1203

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

2026-07-13 23:42:41 +00:00

Add merge-style support to ward agent pr merge #1215

coilyco-ops commented

2026-07-13 23:44:13 +00:00

Author

Member

WARD-OUTCOME: #1215

details

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

Implemented merge-style support end to end. Confidence: high. Surprise: the merge helper needed repo settings before merge so the omitted-style path could pick a usable default. Follow-up: director can merge PR #1215 once the gate is reviewed.

WARD-OUTCOME: https://forgejo.coilysiren.me/coilyco-flight-deck/ward/pulls/1215 <details><summary>details</summary> workflow: pull-request-and-merge; review summary: review gate intentionally skipped because temporary ward default pending brokered QA Implemented merge-style support end to end. Confidence: high. Surprise: the merge helper needed repo settings before merge so the omitted-style path could pick a usable default. Follow-up: director can merge PR #1215 once the gate is reviewed. </details>

coilyco-ops commented

2026-07-13 23:45:26 +00:00

Author

Member

WARDED_WORKFLOW repair-request

PR 1215 is blocked by director review: #1215 (comment)

Repair scope:

Keep the existing PR branch issue-1202 and update PR 1215, do not open a duplicate PR.
Carry Forgejo default_delete_branch_after_merge into the merge request as delete_branch_after_merge unless ward has an explicit override policy.
Add tests proving both true and false repo defaults are preserved in the merge payload.
Rebase or merge current main into the branch. PR 1215 is currently not mergeable because main advanced after PR 1214 merged.
Re-run the ward test command and update PR 1215 when green.

WARDED_WORKFLOW repair-request PR 1215 is blocked by director review: https://forgejo.coilysiren.me/coilyco-flight-deck/ward/pulls/1215#issuecomment-32521 Repair scope: - Keep the existing PR branch `issue-1202` and update PR 1215, do not open a duplicate PR. - Carry Forgejo `default_delete_branch_after_merge` into the merge request as `delete_branch_after_merge` unless ward has an explicit override policy. - Add tests proving both true and false repo defaults are preserved in the merge payload. - Rebase or merge current `main` into the branch. PR 1215 is currently not mergeable because main advanced after PR 1214 merged. - Re-run the ward test command and update PR 1215 when green.

coilyco-ops closed this issue

2026-07-13 23:56:02 +00:00