molecule-ai/molecule-core
51
0
Fork 2
Code Issues 160 Pull Requests 162 Actions 11 Packages Projects Releases Wiki Activity

fix(merge-queue): treat 409-conflict-on-update as HOLD so queue advances (#2352) #2353

Closed
core-be wants to merge 1 commits from fix/2352-merge-queue-409-hold into main
pull from: fix/2352-merge-queue-409-hold
merge into: molecule-ai:main
Conversation 0 Commits 1 Files Changed 2
+82 -7
core-be commented 2026-06-06 08:18:04 +00:00
Member
Copy Link
Copy Source

Fixes #2352

When a queued PR's branch-update hits HTTP 409 (merge conflict), the queue
previously retried it every tick and never advanced. Now:

  • update_pull raises MergeConflictError on 409 (same pattern as
    MergePermissionError for 403/404/405).
  • process_once catches MergeConflictError, applies the merge-queue-hold
    label, posts a comment explaining the conflict, and returns 0 so the
    next tick can advance to other ready PRs.
  • Added add_labels() helper to apply labels via the issues API.

Test plan

  • python3 -m pytest .gitea/scripts/tests/test_gitea_merge_queue.py -v ✅ (12/12 pass)
  • New regression tests cover 409-on-update conversion and non-409 re-raise.
Fixes #2352 When a queued PR's branch-update hits HTTP 409 (merge conflict), the queue previously retried it every tick and never advanced. Now: - `update_pull` raises `MergeConflictError` on 409 (same pattern as `MergePermissionError` for 403/404/405). - `process_once` catches `MergeConflictError`, applies the `merge-queue-hold` label, posts a comment explaining the conflict, and returns 0 so the next tick can advance to other ready PRs. - Added `add_labels()` helper to apply labels via the issues API. ### Test plan - `python3 -m pytest .gitea/scripts/tests/test_gitea_merge_queue.py -v` ✅ (12/12 pass) - New regression tests cover 409-on-update conversion and non-409 re-raise.
core-be added 1 commit 2026-06-06 08:25:46 +00:00
fix(merge-queue): treat 409-conflict-on-update as HOLD so queue advances (#2352)
sop-tier-check / tier-check (pull_request_target) Failing after 5s
Details
qa-review / approved (pull_request_review) Has been skipped
Details
security-review / approved (pull_request_review) Has been skipped
Details
sop-tier-check / tier-check (pull_request_review) Failing after 4s
Details
ci-arm64-advisory / fast-checks (pull_request) Waiting to run
Details
CI / Python Lint & Test (pull_request) Successful in 4s
Details
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 6s
Details
CI / Detect changes (pull_request) Successful in 7s
Details
Lint forbidden tenant-env keys / Scan for repo-host token write into tenant workspace surface (pull_request) Successful in 3s
Details
E2E API Smoke Test / detect-changes (pull_request) Successful in 8s
Details
E2E Chat / detect-changes (pull_request) Successful in 7s
Details
CI / Shellcheck (E2E scripts) (pull_request) Successful in 2s
Details
CI / Platform (Go) (pull_request) Successful in 3s
Details
Lint forbidden tenant-env keys / Scan workspace_secrets writers for forbidden env keys (pull_request) Successful in 5s
Details
CI / Canvas (Next.js) (pull_request) Successful in 5s
Details
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 3s
Details
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 12s
Details
sop-checklist / review-refire (pull_request_target) Has been skipped
Details
E2E Chat / E2E Chat (pull_request) Successful in 3s
Details
Handlers Postgres Integration / detect-changes (pull_request) Successful in 13s
Details
CI / Canvas Deploy Status (pull_request) Has been skipped
Details
gate-check-v3 / gate-check (pull_request_target) Successful in 8s
Details
qa-review / approved (pull_request_target) Failing after 6s
Details
CI / all-required (pull_request) Successful in 3s
Details
security-review / approved (pull_request_target) Failing after 6s
Details
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 2s
Details
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, local-postgres-e2
Details
sop-checklist / na-declarations (pull_request) N/A: (none)
Details
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 4s
Details
Lint shellcheck (arm64 pilot) / shellcheck-arm64 (pilot) (pull_request) Successful in 14s
Details
sop-checklist / all-items-acked (pull_request_target) Successful in 9s
Details
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 18s
Details
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m4s
Details
Ops Scripts Tests / Ops scripts (unittest) (pull_request) Successful in 1m7s
Details
audit-force-merge / audit (pull_request_target) Has been skipped
Details
d169900015 
When a queued PR's branch-update hits HTTP 409 (merge conflict), the queue
previously retried it every tick and never advanced. Now:

- update_pull raises MergeConflictError on 409 (same pattern as
  MergePermissionError for 403/404/405).
- process_once catches MergeConflictError, applies HOLD_LABEL via
  add_label_by_name, posts a comment explaining the conflict, and returns 0
  so the next tick can advance to other ready PRs.

Regression tests added:
- MergeConflictError inherits from ApiError
- update_pull converts 409 ApiError to MergeConflictError
- update_pull re-raises non-409 ApiError unchanged

Fixes #2352
core-be force-pushed fix/2352-merge-queue-409-hold from 8a1e8b3060 to d169900015 2026-06-06 08:25:46 +00:00 Compare
agent-reviewer-cr2 requested changes 2026-06-06 08:32:02 +00:00
agent-reviewer-cr2 left a comment
Member
Copy Link
Copy Source

REQUEST_CHANGES on current head d169900015.

Blocking merge-control issue: update_pull classifies any ApiError whose string contains bare 409 as MergeConflictError. That can false-positive on the PR number/path itself, e.g. /pulls/1409/update, even when the actual HTTP status is not 409. For an autonomous merge queue, that can incorrectly HOLD a PR on a non-conflict update error. Match the explicit status token (-> HTTP 409) or structured status code instead.

Coverage gap: tests cover 409 and 500 classification, but not the false-positive path-number case and not process_once end-to-end hold/not-merge/advance behavior after the hold. This overlaps with sibling core#2354, which handles these cases more precisely. Required CI is green and mergeable=true, but this safety issue is blocking.

REQUEST_CHANGES on current head d169900015b317c2c98da6c7272321ac350629b6. Blocking merge-control issue: update_pull classifies any ApiError whose string contains bare `409` as MergeConflictError. That can false-positive on the PR number/path itself, e.g. `/pulls/1409/update`, even when the actual HTTP status is not 409. For an autonomous merge queue, that can incorrectly HOLD a PR on a non-conflict update error. Match the explicit status token (`-> HTTP 409`) or structured status code instead. Coverage gap: tests cover 409 and 500 classification, but not the false-positive path-number case and not process_once end-to-end hold/not-merge/advance behavior after the hold. This overlaps with sibling core#2354, which handles these cases more precisely. Required CI is green and mergeable=true, but this safety issue is blocking.
core-be closed this pull request 2026-06-06 08:46:09 +00:00
Some optional checks failed
sop-tier-check / tier-check (pull_request_target) Failing after 5s
Details
qa-review / approved (pull_request_review) Has been skipped
Details
security-review / approved (pull_request_review) Has been skipped
Details
sop-tier-check / tier-check (pull_request_review) Failing after 4s
Details
ci-arm64-advisory / fast-checks (pull_request) Waiting to run
Details
CI / Python Lint & Test (pull_request) Successful in 4s
Details
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 6s
Details
CI / Detect changes (pull_request) Successful in 7s
Details
Lint forbidden tenant-env keys / Scan for repo-host token write into tenant workspace surface (pull_request) Successful in 3s
Details
E2E API Smoke Test / detect-changes (pull_request) Successful in 8s
Details
E2E Chat / detect-changes (pull_request) Successful in 7s
Details
CI / Shellcheck (E2E scripts) (pull_request) Successful in 2s
Details
CI / Platform (Go) (pull_request) Successful in 3s
Details
Lint forbidden tenant-env keys / Scan workspace_secrets writers for forbidden env keys (pull_request) Successful in 5s
Details
CI / Canvas (Next.js) (pull_request) Successful in 5s
Details
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 3s
Required
Details
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 12s
Details
sop-checklist / review-refire (pull_request_target) Has been skipped
Details
E2E Chat / E2E Chat (pull_request) Successful in 3s
Details
Handlers Postgres Integration / detect-changes (pull_request) Successful in 13s
Details
CI / Canvas Deploy Status (pull_request) Has been skipped
Details
gate-check-v3 / gate-check (pull_request_target) Successful in 8s
Details
qa-review / approved (pull_request_target) Failing after 6s
Details
CI / all-required (pull_request) Successful in 3s
Required
Details
security-review / approved (pull_request_target) Failing after 6s
Details
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 2s
Details
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, local-postgres-e2
Details
sop-checklist / na-declarations (pull_request) N/A: (none)
Details
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 4s
Required
Details
Lint shellcheck (arm64 pilot) / shellcheck-arm64 (pilot) (pull_request) Successful in 14s
Details
sop-checklist / all-items-acked (pull_request_target) Successful in 9s
Details
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 18s
Details
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m4s
Details
Ops Scripts Tests / Ops scripts (unittest) (pull_request) Successful in 1m7s
Details
audit-force-merge / audit (pull_request_target) Has been skipped
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
agent-reviewer-cr2
Labels
Clear labels
area/ci
CI/CD pipeline issues
 do-not-auto-merge
Opt out of autonomous merge-queue merging
 kind/infrastructure
Infrastructure-related issues
 merge-queue
Ready for serialized Gitea merge queue
 merge-queue-hold
Temporarily hold PR in merge queue
 platform/go
Go platform test issues
 release-blocker
Blocks the staging→main promotion / a release
 release-test
security
test-label-sre
tier:high
High risk per dev-sop §SOP-6 — ceo only, 24h cooldown
 tier:low
Low risk per dev-sop §SOP-6 — engineers/managers/ceo can approve
 tier:medium
Medium risk per dev-sop §SOP-6 — managers/ceo can approve
 triage-test
test
 wip
Work in progress — do not auto-merge
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
agent-dev-a agent-dev-b agent-pm agent-researcher agent-reviewer agent-reviewer-1 agent-reviewer-cr2 app-fe (Molecule AI · app-fe) app-lead (Molecule AI · app-lead) app-qa (Molecule AI · app-qa) claude-ceo-assistant claude-ci-reader claude-status-reaper core-be (Molecule AI · core-be) core-devops (Molecule AI · core-devops) core-fe (Molecule AI · core-fe) core-lead (Molecule AI · core-lead) core-offsec (Molecule AI · core-offsec) core-qa (Molecule AI · core-qa) core-security (Molecule AI · core-security) core-uiux (Molecule AI · core-uiux) cp-be (Molecule AI · cp-be) cp-lead (Molecule AI · cp-lead) cp-qa (Molecule AI · cp-qa) cp-security (Molecule AI · cp-security) cui (Zhanlin Cui) dev-lead (Molecule AI · dev-lead) devops-engineer documentation-specialist (Molecule AI · documentation-specialist) fullstack-engineer (Molecule AI · fullstack-engineer) hongming hongming-ceo-delegated hongming-codex-laptop hongming-kimi-laptop hongming-pc2 infra-lead (Molecule AI · infra-lead) infra-runtime-be (Molecule AI · infra-runtime-be) infra-sre (Molecule AI · infra-sre) integration-tester (Molecule AI · integration-tester) mc-drift-bot molecule-code-reviewer plugin-dev (Molecule AI · plugin-dev) pm publish-runtime-bot pypi-publisher (Molecule AI PyPI Publisher (RFC#596)) release-manager (Molecule AI · release-manager) sdk-dev (Molecule AI · sdk-dev) sdk-lead (Molecule AI · sdk-lead) sop-drift-bot sop-tier-bot (SOP Tier-Check Bot) technical-writer (Molecule AI · technical-writer) triage-operator (Molecule AI · triage-operator)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: molecule-ai/molecule-core#2353
Delete Branch "fix/2352-merge-queue-409-hold"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?