Repository navigation
[PR] fix: cache full compression input as block originals - #6837
ZhaoJun233 wants to merge 6 commits into
Conversation
(ai: vllm-qwen/qwen3.8-27b) 查重: 不重复 — targeted one-line fix for #6834 (the Review of PR #6837 (head What it does. One line in
Why it's correct (consistency, not a new idea). The actual fold ( Verification I ran (local, targeted):
Behavior change (flagged per policy). Old → new: the Gate. This is a 结构化八问
判定:修复正确、最小、测试有牙(老代码会红),本地定向验证全绿、typecheck 干净;CI 仍在跑(需等绿)。因涉及源选取回退(§7.4 人工档)+ 作者自标"需人工 review",不建议自动合并——待 CI 绿 + owner 人工确认后合并。 |
🔶 需要决策 (ai: vllm-qwen/qwen3.8-27b) Diagnosis (verified live this run)Head This PR's one-liner (
The decision: #6837 is a duplicate of #6852Both PRs close issue #6834:
#6852's final state is a strict superset of #6837's change — if #6852 merges, #6837's diff is fully subsumed. Making #6837 green requires reproducing #6852's two fix commits ( Options
Default if undecided: leave #6837 open-but-red and let #6852 proceed to merge; owner closes #6837 as a duplicate. (Closing PRs is human-only — I can't do it myself.) |
七问(本次 CI 运行小结)
判定:非机械可修(重复 PR + 真回归),按 owner policy 2026-11-01 升级「🔶 需要决策」+ |
[ework] CI fix verified green ✓ |
8ed436c to
9241bcd
Compare
|
逐项回应初次评审、回归及重复关系诊断、七问小结和后续 CI 通知:
|
(ai: vllm-qwen/qwen3.8-27b) CI 状态(重新核验,mirror cache 2026-11-16T04:03:28Z): 新 head 纠正我上一轮的一个判断: 我此前说「#6837 是 #6852 的严格子集、只能照抄 #6852 两个提交才能变绿」——对当前提交不再成立。我读了新 diff,确认两份现在是不同的实现路径:
我核对了三点:① goldens 确实未动(提交只改 决策项更新: 代码回归已修、CI 已绿。剩下的是「#6834 的合入载体选 #6837 还是 #6852」——两份现在都是绿的,区别在实现路径与 #6834「完整正文」的覆盖面:#6837 两条车道都用完整 raw 正文,#6852 的 plugin 车道用 processed view。后者对 plugin 车道的完整正文覆盖是否等价,取决于紧急截断是否作用到 plugin 的 display view——这一点我未验证,留给 owner/reviewer 判断。代价上 #6837 更绕(per-message map + 正则 + 三道闸),#6852 更简(一个字段、无正则)。 我维持 needs-decision 标签,不关闭任何一份 PR(关闭是 human-only)。建议 owner 比较两份当前 diff 后择一,不重复合入同一修复。 八问(本轮 CI 修复):
收工判定: CI 红灯已解除(全绿),回归已修复;「#6834 合入载体择一」是 owner 决策项,needs-decision 标签保留,等 owner 拍板。 |
Backport the wire-exit-matrix slice of upstream 297709e. The 400ms fallback could abort before forwarding, leaving requests=0 and closed=0 on Windows CI. Refs ranxianglei#4599. Validated on Windows with Node 22.23.4: the delayed-dispatch scenario reproduces the original assertion before the fix; all four delayed abort cases pass after it. The original wire-exit and compress-original-cache suites pass 12 tests. Typecheck and build pass.
(ai: vllm-qwen/qwen3.8-27b) 冲突已解决并推送,PR 恢复可合并状态。 本轮处理:PR #6837 与 master 的合并冲突(merge state: dirty)。
CI 状态: 新 head 七问:
判定: 冲突已解决,PR 恢复可合并状态;CI 在新 head 上运行中,待其绿后由 owner 决定 #6834 的合入载体(#6837 vs #6852, |
[ework] CI fix verified green ✓ |
2 similar comments
[ework] CI fix verified green ✓ |
[ework] CI fix verified green ✓ |
Summary
Closes #6834.
After emergency truncation, cache block originals from the same complete input used to apply compression so full decompression can restore text omitted from the display view. Preserve the already rendered citation prefix only when its raw message ID and state ref match; the display body never replaces complete source text.
Evidence
Regression reasoning
Restored content must retain both the complete source and its existing reference so subsequent lookups resolve the same message. Only a leading displayed tag owned by the matching raw ID/state ref is copied, without duplicating an identical existing prefix or stripping raw quoted content. No new ref or token estimate is synthesized. Empty/absent source handling and tier collectors retain their existing contracts; the current-base effective-range receipt fix (#6855) is preserved.
Merge Danger
Door: two-way
Blast Radius: recovery
New caches retain complete originals and may occupy more space. Existing clipped caches are not rebuilt. Storage format, kernel behavior and release version are unchanged. Human review is required before merge.