You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
[Root Cause] conflict-watch (auto-maintained, do not close manually) | [根因] conflict-watch(自动维护,勿手动关闭) #6366
changed the title [-][根因] conflict-watch(自动维护,勿手动关闭)[/-][+][Root Cause] conflict-watch (auto-maintained, do not close manually) | [根因] conflict-watch(自动维护,勿手动关闭)[/+]on Nov 12, 2026
Activity
[-][根因] conflict-watch(自动维护,勿手动关闭)[/-][+][Root Cause] conflict-watch (auto-maintained, do not close manually) | [根因] conflict-watch(自动维护,勿手动关闭)[/+]ranxianglei commentedon Nov 12, 2026
[bot] 🏷
本批(#5767 + #5786)的根因修复 PR 已存在:PR #6355(前一个 worker 已开,标题 "fix(conflict-watch): stop native compaction landings from lighting the conflict banner (#5767, #5786)")。按「一个线程一个修复 PR」规则,我没有另开 PR,而是把它的两个 commit 重新落到当前 master 上。
我做了什么:
src/server/claude-compaction-guard.ts(三闸门 claude 续写句检测器 carrier/novelty/standalone)+src/server/prepare-anthropic.ts接线(claude 车道命中 → 记native-compactionhandled tier + rebase,不再落unannounced-rewritesignal tier)。dirty)。我把两个 commit cherry-pick 到当前 master(33104b1f95)上,干净无冲突,7 文件 +542/-20。为什么一个 PR 修整批: 两个 issue 同症状(recovered 证据被误判成 alarm banner)+ 同子系统(conflict-watch 分类/display 层),只是触发机制不同(#5786 = id-churn-adoption 分类错;#5767 = claude native compaction 归因缺失)。PR #6355 的两个 commit 分别对应两个机制,合起来是整批的根因闭环。
下一步: 把 rebase 后的分支推回 PR #6355(force-push,因为是 rebase),然后跑 dsh 回归套件确认 prepare-anthropic.ts 改动不破坏既有 dsh 检测。
8 问
id-churn-adoption被 display 分类器(src/web/client.tsbili_conflictSeverity +src/conflict-watch.tsformatConflictSection)当 unexplained signal 计入 signalN;Compression conflict banner (bili v0.1.208, node v26.8.2, darwin-arm64) #5767 =src/server/prepare-anthropic.ts压缩落地检测只认 dsh 框架,claude 续写句不被识别 → 落unannounced-rewrite(signal tier)。native-compaction(handled tier)+ rebase,与 dsh 车道同等待遇。src/conflict-watch.ts、src/web/client.ts、src/server/prepare-anthropic.ts、src/server/claude-compaction-guard.ts(新文件)。用户面:claude 车道自动压缩落地 + 跨构建 id 重铸的会话不再误报 banner。tests/issue5767-claude-native-compaction.test.ts(354 行 e2e 正例+4 反例+三闸门单测+漂移钉)、tests/web-conflict-banner.test.ts(Compression conflict banner (bili v0.1.212, node v24.19.0, win32-x64) #5786 纯 id-churn 静默+混合仍报警)、tests/conflict-lifecycle.test.ts(Compression conflict banner (bili v0.1.212, node v24.19.0, win32-x64) #5786 分类层)。CLAUDE_COMPACTION_CONTINUATION_PREFIX),Claude Code 改措辞则检测降级为 miss(回退 Compression conflict banner (bili v0.1.208, node v26.8.2, darwin-arm64) #5767 前归档路径),不会误报;dsh 回归未跑完,prepare-anthropic.ts 改动对既有 dsh 检测的影响待验证。