the-open-engine / zeroshot / 36222522431

96%

Build Type

push

github

Committed by web-flow

Commit Message

fix(delivery): respect base branch merge policy (#1164)

## Summary

Ship delivery now selects a merge method allowed by both repository
settings and the PR's base-branch policy. For example, a repository that
enables merge commits but requires linear history on `main` uses an
allowed squash or rebase method. Both branch-protection views and every
active applicable ruleset constrain the selection.

Direct merge submission reads all rule pages through a dedicated query.
PR-only delivery keeps its existing readiness contract, and merge queues
retain method selection. Fresh approval and branch-freshness checks
prevent a merge request when the PR needs to wait or update.

Permanent GitHub rejections stop with bounded, credential-redacted
diagnostics. Native CLI HTTP errors retain authentication refresh and
transient retry behavior, while merge commands retain existing
process-tree cleanup. Confirmed merges still reconcile a lost command
response. Exact-head checks and published-history guards remain
enforced.

Closes #1161.

## Validation

- Regression tests cover more than 100 applicable rules, restrictions
across pages, all repository-method combinations, protection views,
malformed policy, PR-only delivery, queues, approval/freshness races,
native CLI errors, rejection races, and helper cleanup on completion,
timeout, and cancellation.
- Read-only live queries validate the production schema and real
multi-page rule traversal. Independent review covered policies and
permissions across ten repositories.
- Full workspace suite: 1,928 passed, 12 ignored across 107 test
targets, including all 221 delivery tests. Tests used four threads and
CI's pinned Restic sidecar.
- Rust formatting and staged Opcore Zero Verify pass for all 10 changed
source files. Workspace Clippy passes with warnings denied.

Opcore Zero Verify passes. Sense reports no introduced findings, with
partial Rust dependency/interface coverage. The earlier CI coverage run
failed in an unchang... (continued)

Coverage Stats

281 of 285 new or added lines in 4 files covered. (98.6%)

2 existing lines in 1 file now uncovered.

58809 of 61238 relevant lines covered (96.03%)

12226.39 hits per line