Repository navigation
Conversation
) A merge whose stranded turn partner is BLOCKED could never proceed: ranxianglei#5919 made it an idempotent no-op, but a BLOCKED partner can never age into foldability — its body is gone for good — so the no-op was a permanent deadlock and old blocks could never consolidate (session-ad47cd30, 6,115 BLOCKED messages, context stuck at 533K/792K). BLOCKED partners carry no content turn-integrity protects, so they no longer doom a merge; the ladder extends the fold to them (rung 2) and the turn closes under the merged block. Protected-tool / recent-zone / unrecoverable-media partners still doom a merge, exactly as before. Tests: new kernel/tests/issue6709-blocked-merge-partners.test.ts (BLOCKED only, BLOCKED + foldable, BLOCKED + protected-tool); ranxianglei#5919 test 5919-2 updated to the new BLOCKED behavior. Kernel suite 1639/1639 green, typecheck clean. Bumps acp-kernel 0.0.197 -> 0.0.198.
Owner
[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b) 查重:不重复——#6719 是唯一修 #6709「BLOCKED 伙伴死锁块合并」的 PR;#6305 虽也提 BLOCKED,但机制不同(改 acp_status 不再推荐 BLOCKED 端点,不碰合并梯子),不重复。 已独立审完(kernel 改动,高敏感域)。结论:方向正确、修法干净、测试有牙、无回归,建议合入(待 CI 全绿 + 人工 review——kernel 改动按 Kernel Boundary 规则 3 必须人工把关)。 我做了什么(独立审核,非复读 issue):
结构化八问
判定方向对、修法对、测试有牙、无回归;kernel 边界规则齐(声明✓ / 版本 0.0.197→0.0.198✓ / 两层测试✓ / golden pin 未动✓ / 结构不变量✓);owner 已在 #6709 拍板(「会在 214 基础上追加 215 解决」)。建议合入,待 CI 全绿 + 人工 review。 |
ranxianglei
pushed a commit
that referenced
this pull request
Nov 14, 2026
…gate (#6709) kernel-change: BLOCKED (never-foldable) messages no longer block the merge integrity gate. The #5919 fix turned the fatal into a no-op, but a BLOCKED partner can never age into foldability (its body is gone permanently), so the no-op is a permanent deadlock: every merge touching that turn re-fails identically. The fix adds a neverFoldableIds parameter to computeIntegrityWithdrawals so the merge can proceed without the BLOCKED partner blocking the turn-integrity check. The BLOCKED message itself is never included in the merge (it is never foldable), but its turn-mates can now be folded. This is a different approach from PR #6719 (which includes BLOCKED messages in the merge coverage). This approach keeps BLOCKED messages out of the block's coverage, which is safer for the compressedTokens accounting. Fixes #6709
lock-sync regenerates the lockfile and diffs it; the kernel version bump left the lockfile recording acp-kernel 0.0.197. Update the one version line so lock-sync passes.
ranxianglei
added a commit
that referenced
this pull request
Nov 14, 2026
The #5919 merge no-op treats every ref='BLOCKED' partner as "cannot be closed now", but that conflates two very different cases. A content-free BLOCKED partner (body removed by native compression) carries no live wire content and can never age into foldability, so letting it doom the merge turns the no-op into a permanent deadlock: every merge covering its turn re-hits the same skip and the session stays stuck at its context ceiling (#6709, session-ad47cd30, 6,115 BLOCKED). A LIVE protected tool / unrecoverable media is pinned to ref 'BLOCKED' by assignRefs too, with its full body still in the wire — folding it in drops protected content and leaving it split emits an orphaned tool_call/tool_result. Exempt only content-free BLOCKED partners (ref BLOCKED AND not live-protected-tool AND not host-protected AND not unrecoverable-media) from the merge-deadlock; they flow to the #5919 rung-2 fallback and are folded into the merged block, closing the turn. Live protected tools / media still doom the merge into the honest no-op. This is the correct superset of the two related PRs (#6719: flow-all- BLOCKED-to-rung2; #6731: key-on-ref-BLOCKED, keep-split) — both keyed on ref==='BLOCKED' alone, and both masked the live-protected case by giving the protected partner a numeric ref in their regression tests. 5919-5 adds that guard (live protected tool stored as ref BLOCKED still no-ops). Refs: #6709, #6719, #6731
ranxianglei
added a commit
that referenced
this pull request
Nov 14, 2026
The #5919 merge no-op treats every ref='BLOCKED' partner as "cannot be closed now", but that conflates two very different cases. A content-free BLOCKED partner (body removed by native compression) carries no live wire content and can never age into foldability, so letting it doom the merge turns the no-op into a permanent deadlock: every merge covering its turn re-hits the same skip and the session stays stuck at its context ceiling (#6709, session-ad47cd30, 6,115 BLOCKED). A LIVE protected tool / unrecoverable media is pinned to ref 'BLOCKED' by assignRefs too, with its full body still in the wire — folding it in drops protected content and leaving it split emits an orphaned tool_call/tool_result. Exempt only content-free BLOCKED partners (ref BLOCKED AND not live-protected-tool AND not host-protected AND not unrecoverable-media) from the merge-deadlock; they flow to the #5919 rung-2 fallback and are folded into the merged block, closing the turn. Live protected tools / media still doom the merge into the honest no-op. This is the correct superset of the two related PRs (#6719: flow-all- BLOCKED-to-rung2; #6731: key-on-ref-BLOCKED, keep-split) — both keyed on ref==='BLOCKED' alone, and both masked the live-protected case by giving the protected partner a numeric ref in their regression tests. 5919-5 adds that guard (live protected tool stored as ref BLOCKED still no-ops). Refs: #6709, #6719, #6731
ranxianglei
added a commit
that referenced
this pull request
Nov 14, 2026
The #5919 merge no-op treats every ref='BLOCKED' partner as "cannot be closed now", but that conflates two very different cases. A content-free BLOCKED partner (body removed by native compression) carries no live wire content and can never age into foldability, so letting it doom the merge turns the no-op into a permanent deadlock: every merge covering its turn re-hits the same skip and the session stays stuck at its context ceiling (#6709, session-ad47cd30, 6,115 BLOCKED). A LIVE protected tool / unrecoverable media is pinned to ref 'BLOCKED' by assignRefs too, with its full body still in the wire — folding it in drops protected content and leaving it split emits an orphaned tool_call/tool_result. Exempt only content-free BLOCKED partners (ref BLOCKED AND not live-protected-tool AND not host-protected AND not unrecoverable-media) from the merge-deadlock; they flow to the #5919 rung-2 fallback and are folded into the merged block, closing the turn. Live protected tools / media still doom the merge into the honest no-op. This is the correct superset of the two related PRs (#6719: flow-all- BLOCKED-to-rung2; #6731: key-on-ref-BLOCKED, keep-split) — both keyed on ref==='BLOCKED' alone, and both masked the live-protected case by giving the protected partner a numeric ref in their regression tests. 5919-5 adds that guard (live protected tool stored as ref BLOCKED still no-ops). Refs: #6709, #6719, #6731
lock-sync also regenerates the kernel lockfile; the version bump left it recording acp-kernel 0.0.197 in two places. Update both version lines so lock-sync passes.
ranxianglei
added a commit
that referenced
this pull request
Nov 15, 2026
The #5919 merge no-op treats every ref='BLOCKED' partner as "cannot be closed now", but that conflates two very different cases. A content-free BLOCKED partner (body removed by native compression) carries no live wire content and can never age into foldability, so letting it doom the merge turns the no-op into a permanent deadlock: every merge covering its turn re-hits the same skip and the session stays stuck at its context ceiling (#6709, session-ad47cd30, 6,115 BLOCKED). A LIVE protected tool / unrecoverable media is pinned to ref 'BLOCKED' by assignRefs too, with its full body still in the wire — folding it in drops protected content and leaving it split emits an orphaned tool_call/tool_result. Exempt only content-free BLOCKED partners (ref BLOCKED AND not live-protected-tool AND not host-protected AND not unrecoverable-media) from the merge-deadlock; they flow to the #5919 rung-2 fallback and are folded into the merged block, closing the turn. Live protected tools / media still doom the merge into the honest no-op. This is the correct superset of the two related PRs (#6719: flow-all- BLOCKED-to-rung2; #6731: key-on-ref-BLOCKED, keep-split) — both keyed on ref==='BLOCKED' alone, and both masked the live-protected case by giving the protected partner a numeric ref in their regression tests. 5919-5 adds that guard (live protected tool stored as ref BLOCKED still no-ops). Refs: #6709, #6719, #6731
Owner
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
kernel-change: BLOCKED stranded partners no longer veto block merges — the #5919 no-op is a permanent deadlock for content-free partners, and the fix is a one-predicate change in the kernel merge ladder with a regression test.
What broke
Merging old blocks (b312..b315, b312..b313) always skips when a turn partner has ref BLOCKED: #5919 made that an idempotent no-op, but a BLOCKED partner can never age into foldability (its body is gone for good), so the merge can never proceed and the session stays stuck at its context ceiling. Same reporter and session as #5919 (session-ad47cd30, 6,115 BLOCKED messages, 533K/792K on 0.1.214).
What changed
How verified
Fixes #6709