Repository navigation
fix: exclude display-only plugins & separate suspected from confirmed conflicts (#2324) - #2331
Conversation
📦 Built Package ArtifactBranch: Option A — Install this exact build (recommended)npm install -g billion-context@0.0.2578-pr.2331.67bc80eThis exact version is immutable and reproducible. The rolling Option B — Download artifact
tar xzf billion-context-pr2331.tgz
npm install -g packageInstall instructions are refreshed on each push. |
[bot] 🏷 PR #2331 review 结论(Closes #2324)。我独立重验了全部关键声明,不是照单全收。 先说验证过什么: 结构化七问
|
|
又冲突 |
…m confirmed conflicts (#2324) - thirdparty-scan: add evidence-backed KNOWN_DISPLAY_ONLY allowlist (pi-compact-transcript), matched as an exact token (bare / npm spec / bounded path segment) mirroring isOpencodeAcpEntry; guard every KEYWORD_RE site so display-only plugins no longer raise [suspected]. - conflict-watch: summarizeConflicts now reports a suspected count (additive subset of kinds[third-party-plugin], disjoint from sibling). - web banner: new pure bili_conflictSeverity() picks title/risk wording from the families present; name-only [suspected] matches get a soft "verify first" framing instead of the imperative keep-one-compressor warning, and only a CONFIRMED conflict (known third-party / native) triggers it. Localize the age split (active/historical -> recency) so records are not read as currently-running conflicts. Old payloads without c.suspected degrade to the previous behavior.
103fb0f to
5d8ecb7
Compare
[bot] 🏷 上游冲突已解决并 push(rebase)。摘要如下。 冲突来源:master 期间合并了 #2219/#2220(冲突面按客户端给处置提示),恰好改到本 PR 的同一批文件—— 怎么解的(取两者意图的并集,不是二选一):
验证(全部在 rebase 后的新 head 上跑):
回归审查(rebase 本身是否破坏既有行为):无新增行为变更。并集严格保持两个 PR 各自声明的语义;唯一"变化"是 banner 现在同时呈现"疑似/确认分级措辞+颜色"与"按客户端处置块",两者本就是各自 PR 的意图。acp_status 文本路径、持久化格式、配置面均未动。 当前状态:PR 判定:冲突已解、代码在最新 base 上定向验证全绿,等 CI 转绿后即可由你手动合并(我不代合)。 |
📦 Merged Build PublishedThis merge to master was published as npm install -g billion-context@0.0.142-master.a5e7af1 # this exact build
npm install -g billion-context@master # always the newest merged build
|
Fixes #2324
是什么问题
Overview /
GET /__bili/stats → conflicts把仅改终端显示的插件pi-compact-transcript当成与 bili 并存的第三方压缩器,打出"两个压缩器会双压缩、破坏消息引用——请只保留一个压缩器"的命令式告警。该插件实际只折叠工具输出/调整消息渲染,不压缩发给模型的上下文;且触发告警的记录全部是[suspected](纯名称匹配),并非已观察到的冲突。根因(分层)
src/thirdparty-scan.ts的KEYWORD_RE命中名字里的compact,会话首请求写入[suspected]记录——纯名称匹配,不验证是否真的压缩上下文。src/web/client.tsoverview 渲染)把所有third-party-plugin记录都当作"已确认第三方压缩器";只要tpN>0 && active>0就套用conflict.risk_active(那句命令式文案),全[suspected]也照打。对比:acp_status 文本路径(formatConflictSection)早在 [bug] acp_status COMPRESSION CONFLICTS mis-attribution: native dsh-compaction-basic labeled "dsh-context [suspected]" #1736 就区分了 suspected/confirmed,唯独 Web banner 没跟上。N active · M historical用词让用户把"近 7 天有记录"读成"当前正在运行的冲突"。怎么修的(同一失败域:疑似 vs 实际被混为一谈,一个 PR 分点处理)
KNOWN_DISPLAY_ONLY白名单(首个条目pi-compact-transcript,其 README 明确 "changes display only")。按解析后的精确 token 匹配——bare / npm spec(含版本)/ 有界路径段——复用isOpencodeAcpEntry的纪律,避免两套判定漂移。不是 transcript/display 子串规则:真实压缩器(context-compactor)与近似名(my-pi-compact-transcript-fork)仍会命中。全部 8 处KEYWORD_RE站点都加了守卫。summarizeConflicts增补suspected计数(kinds["third-party-plugin"]的子集,与sibling不相交)。新增纯函数bili_conflictSeverity(c)按"存在哪些家族"选标题/风险措辞:只有存在已确认冲突(known third-party 或 native-compaction)才用命令式"双压缩/只留一个";纯疑似改用中性"名称关键词匹配、非双压缩证据、先确认再处理、勿按名移除只读工具",标题软化为"检测到疑似压缩插件"。疑似+实际混合时保留强告警并同时点名两类。POST /__bili/conflicts/clear本已存在;配合检测排除后新的误报不再产生,无需新增配置或字段。[suspected](旧:每个新会话都命中关键词写入一条 suspected 记录 → 新:完全不产生 finding)。本 issue 核心修复。未知但含压缩关键词的插件仍产生 suspected 提示。warn仅在 confirmed && active 时)。连带:sibling-only(bili 自家兄弟扩展,本就自动让位、非冲突)由 warn 降为 info 中性色——良性场景不再告警,属改进。已确认冲突的显示(active→warn / historical→info)不变。N active · M historical(英文硬编码)→ 本地化"近 7 天 N 条 / 更早 N 条"。含义不变(同为 7 天窗口切分),仅消除"active=运行中"的误读。兼容性
c.suspected字段)→suspectedN=0,banner 输出与修复前逐字一致(所有非 sibling 插件事件仍视为已确认),升级不回归;有专门测试钉住。formatConflictSection未改动([bug] acp_status COMPRESSION CONFLICTS mis-attribution: native dsh-compaction-basic labeled "dsh-context [suspected]" #1736/web报警: billion-context-pi opencode-acp不属于第三方插件,同时安装并没有冲突 #2261/[bug] 冲突横幅的 22 event(s) 是原生 compaction 的存量记录,且没有任何清除路径(归因文案误导 + acp_status 指引失效) #2102 行为保持)。CONFLICT_ACTIVE_WINDOW_MS(7 天内部常量)未动。ConflictSummary是瞬态 stats 响应 JSON,非落盘格式;suspected只是新增响应字段。测试
tests/web-conflict-banner.test.ts:新增bili_conflictSeverity决策矩阵 7 例(纯疑似 / 已确认-active / 已确认-historical / sibling-only / 疑似+实际混合 / native-only / 旧 payload 降级)+ age 标签本地化断言更新。tests/issue1206-thirdparty-scan.test.ts:新增 pi/opencode 扫描排除用例(bare+版本 source 不报、真实压缩器仍报)、isKnownDisplayOnlyPlugin形式识别单测(含近似名反例)、summarizeConflicts.suspected计数用例(与 sibling 不相交)。npm run typecheck绿 + 上述三套件 50/50 绿(rebase 到当前 master 后复跑)。全量回归交给 CI。Closes #2324