Repository navigation
Conversation
… against demoting the overflow-arm (ranxianglei#6865) The ranxianglei#5974 corrective-second-pass probe writes its local estimate onto the session baseline without an overflow-arm guard, demoting the active overflow-arm tag to "estimate" before the ranxianglei#5880 guard reads it and re-opening the ranxianglei#5880 400-livelock on a different code path. The same unguarded write exists on the post-rebuild anchor in the same preflight flow: the probe guard alone does not hold the arm through the turn (the regression test proves it). Both writes now skip the demotion while the arm is active, same doctrine as relay.ts ranxianglei#2484 armFailureShrink. Regression test pins both directions: armed stays overflow-arm (tag plus the separately recorded overflowArmTokens ceiling), unarmed still demotes to estimate as before.
(ai: qwen/qwen3.8-27b) Dup check: PR #6868 is a parallel second PR closing #6865 — PR #6867 (opened ~1 min earlier) closes the same issue and guards the same overflow-arm demotion. The two overlap: #6867 guards the probe write (extracted to Critical coordination problem (merge blocker): Three open PRs all rewrite the same two baseline-write sites in
#6868 cannot merge alongside both #5899 and #6867. The owner must pick which approach to keep. Technical assessment of #6868 (verified live):
8问 (PR review):
结论: #6868 的代码本身正确、完整、无回归,测试有牙,CI 绿。但存在严重协调冲突——与 #5899 和 #6867 都改同一处代码,且 #6867 和 #6868 都关 #6865。需 owner 决策保留哪条路线。 🔶 需要决策 背景: 三个 PR 都在修 #5880/#6865 的 overflow-arm 降级问题,且都改 待决问题: 保留哪条修复路线? 选项:
推荐: A——抽到 session.ts 跟现有 不决定的默认行为: 三个 PR 都挂着、互相冲突、无法合并——#5880/#6865 的 livelock 修复被阻塞。 标签: 建议 bug / p1 / scope/kernel(本环境 label API 与 add-label.sh 均不可用,未能自动打标,请 owner 手动补)。 |
The #5974 probe writes its local estimate onto the session baseline without an overflow-arm guard, so an armed session gets its tag demoted to "estimate" before the #5880 guard reads it. That re-opens the #5880 400-livelock on a different code path.
What changed: both unguarded writes in preflightCompressIfNeeded now skip the demotion while the arm is active, the probe write and the post-rebuild anchor. The anchor needed the same guard: the issue assumes it is guarded, but no applyPostRebuildBaselineAnchor exists on master and the probe guard alone does not hold the arm through the turn. The regression test proves it, the armed case fails on unfixed code.
Tests: new test pins both directions, 2/2 green, and it fails on unfixed code as expected. Neighbour tests green (issue2484, issue2313, issue1839, issue5191, issue5974-preflight-view-divergence, e2e-overflow-selfheal). Typecheck clean on the touched files. Full suite verdict is remote CI.
Fixes #6865