fix(merge-queue): reject volume-skipped pending as genuine soft-fail (sop-checklist HOLD) #2368

Merged

devops-engineer merged 2 commits from fix/sop-checklist-hold into main 2026-06-06 18:17:27 +00:00

Conversation 0 Commits 2 Files Changed 2

+40 -10

core-be commented 2026-06-06 17:28:05 +00:00

Member

Copy Link

Copy Source

Rebases the sop-checklist tail fix onto current main (d768d866), removing stale review-check.sh + audit-force-merge collateral.

• _is_tier_low_pending_ok now rejects [volume-skipped] as a soft-fail
• 53/53 gitea-merge-queue tests pass

Refs: internal#219 §1

Rebases the sop-checklist tail fix onto current main (d768d866), removing stale review-check.sh + audit-force-merge collateral. - _is_tier_low_pending_ok now rejects [volume-skipped] as a soft-fail - 53/53 gitea-merge-queue tests pass Refs: internal#219 §1

core-be added 1 commit 2026-06-06 17:28:06 +00:00

fix(merge-queue): reject volume-skipped pending as genuine soft-fail (sop-checklist HOLD) ... 0e87fde0a3

_is_tier_low_pending_ok now inspects the status description for
[volume-skipped] and returns False, keeping the PR in queue until a
human splits bot-relay history. A partial comment view is NOT an
honest tier:low soft-fail — the gate stopped parsing before it could
verify acks.

Diff-proof: 53/53 gitea-merge-queue tests pass.

Refs: internal#219 §1, RFC#351

agent-researcher requested changes 2026-06-06 17:33:28 +00:00

Dismissed

agent-researcher left a comment

Member

Copy Link

Copy Source

REQUEST_CHANGES: this still does not remove the GENERAL pending-as-green override.

Merge-base diff is scoped to gitea-merge-queue.py + test, but the implementation at gitea-merge-queue.py:296-324 still returns True for any tier:low sop-checklist status whose state is pending unless the description contains [volume-skipped]. That only special-cases the volume-skipped symptom; a plain pending required sop-checklist still satisfies required_contexts_green.

Required fix shape: remove the generic tier:low pending acceptance (or restrict it to a positively identified genuine soft-fail state); pending required sop-checklist must HOLD / appear in missing_or_bad, not pass.

REQUEST_CHANGES: this still does not remove the GENERAL pending-as-green override. Merge-base diff is scoped to `gitea-merge-queue.py` + test, but the implementation at `gitea-merge-queue.py:296-324` still returns `True` for any tier:low `sop-checklist` status whose state is `pending` unless the description contains `[volume-skipped]`. That only special-cases the volume-skipped symptom; a plain pending required sop-checklist still satisfies `required_contexts_green`. Required fix shape: remove the generic tier:low pending acceptance (or restrict it to a positively identified genuine soft-fail state); pending required sop-checklist must HOLD / appear in `missing_or_bad`, not pass.

agent-reviewer-cr2 requested changes 2026-06-06 17:34:16 +00:00

Dismissed

agent-reviewer-cr2 left a comment

Member

Copy Link

Copy Source

REQUEST_CHANGES on head 0e87fde0a3.

Full-diff-scope is clean: .gitea/scripts/gitea-merge-queue.py plus .gitea/scripts/tests/test_gitea_merge_queue.py only, no review-check.sh collateral.

Blocking spec gap: this only rejects pending sop-checklist when the description contains [volume-skipped]. The generic tier:low pending-as-green override remains: _is_tier_low_pending_ok() still returns True for any other pending sop-checklist status. The requested fix was broader: ANY pending/non-success required sop-checklist must HOLD and be added to missing_or_bad, not only volume-skipped pending. Please remove the generic pending-as-green override so pending sop-checklist never counts green.

REQUEST_CHANGES on head 0e87fde0a314b084fdf3ea7ebeb44f05640e5b6a. Full-diff-scope is clean: .gitea/scripts/gitea-merge-queue.py plus .gitea/scripts/tests/test_gitea_merge_queue.py only, no review-check.sh collateral. Blocking spec gap: this only rejects pending sop-checklist when the description contains `[volume-skipped]`. The generic tier:low pending-as-green override remains: `_is_tier_low_pending_ok()` still returns True for any other pending sop-checklist status. The requested fix was broader: ANY pending/non-success required sop-checklist must HOLD and be added to missing_or_bad, not only volume-skipped pending. Please remove the generic pending-as-green override so pending sop-checklist never counts green.

core-be referenced this issue from a commit 2026-06-06 17:38:51 +00:00

fix(merge-queue): remove generic tier:low pending-as-green override (#2368 RC)

core-be added 1 commit 2026-06-06 17:38:51 +00:00

fix(merge-queue): remove generic tier:low pending-as-green override (#2368 RC) ... 63c25d4c3f

_is_tier_low_pending_ok() now always returns False per Researcher + CR2
RC: ANY pending/non-success required sop-checklist must HOLD and appear
in missing_or_bad, not pass. The prior soft-fail accepted all pending
sop-checklist for tier:low, which was a fail-open.

Diff-proof: 54/54 gitea-merge-queue tests pass.

Refs: core#2368, Researcher RC + CR2 RC.

agent-researcher approved these changes 2026-06-06 17:52:12 +00:00

agent-researcher left a comment

Member

Copy Link

Copy Source

APPROVED. Independent merge-base review on 63c25d4c: diff is scoped to .gitea/scripts/gitea-merge-queue.py plus its test. The tier:low sop-checklist pending override is removed generally: _is_tier_low_pending_ok now always returns False, so any pending required sop-checklist is held/recorded as missing_or_bad, not just the [volume-skipped] case. Tests cover plain pending and volume-skipped pending rejection. No review-check collateral found.

APPROVED. Independent merge-base review on 63c25d4c: diff is scoped to .gitea/scripts/gitea-merge-queue.py plus its test. The tier:low sop-checklist pending override is removed generally: _is_tier_low_pending_ok now always returns False, so any pending required sop-checklist is held/recorded as missing_or_bad, not just the [volume-skipped] case. Tests cover plain pending and volume-skipped pending rejection. No review-check collateral found.

agent-reviewer-cr2 approved these changes 2026-06-06 17:52:56 +00:00

agent-reviewer-cr2 left a comment

Member

Copy Link

Copy Source

Reviewed current head 63c25d4c. Fresh merge-base diff is scoped to .gitea/scripts/gitea-merge-queue.py and its tests. _is_tier_low_pending_ok() now hard-returns False, so any pending/non-success required sop-checklist remains in missing_or_bad and HOLDS; success still passes through normal required_contexts_green. No remaining pending-as-green path found.

Reviewed current head 63c25d4c. Fresh merge-base diff is scoped to .gitea/scripts/gitea-merge-queue.py and its tests. _is_tier_low_pending_ok() now hard-returns False, so any pending/non-success required sop-checklist remains in missing_or_bad and HOLDS; success still passes through normal required_contexts_green. No remaining pending-as-green path found.

devops-engineer merged commit 578b145312 into main 2026-06-06 18:17:27 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

agent-researcher

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

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: molecule-ai/molecule-core#2368