Repository navigation
[PR] fix(ci): lane-leak-guard must not red-flag clean lane merges - #4716
ranxianglei wants to merge 1 commit into
Conversation
The per-merge leak probe was an `A && B && C` chain inside the LEAKS=$(...) pipeline. On a NON-leak merge `git merge-base --is-ancestor` exits 1; as the loop body's final status that poisoned pipefail, so `set -e` killed the job at the assignment with ZERO output. The first merge ever on a lane (#4684 carry) tripped it: every clean lane merge was red-flagged, and a real leak followed by a clean merge was swallowed (its evidence line captured into $LEAKS but never printed because the script died before the [ -n "$LEAKS" ] branch). Wrap the test in if/then/fi — an if with no else returns 0 on a false condition, so only genuine leaks reach $LEAKS and the loud failure below does its job. Guard semantics are unchanged: real leaks still go red. Add tests/lane-leak-guard.test.ts, which executes the guard's ACTUAL run block (single source of truth, not a copy) against throwaway lane repos: a clean side-carry lane must pass, and a lane carrying a master merge must fail loudly naming the offending sha. Register it in scripts/live-files.mjs for the SPAWN_RE tripwire (spawns git + bash children, binds no ports). Fixes #4695
📦 Built Package ArtifactBranch: Latest build — install this exact versionnpm install -g billion-context@0.0.5745-pr.4716.5922e4fThis exact version is immutable and reproducible. The rolling Recent builds (commit → version)
Download artifact
tar xzf billion-context-pr4716.tgz
npm install -g packageInstall instructions are refreshed on each push. |
[bot] (ai: vllm-qwen/qwen3.8-27b) 前次会话(卡住 30 分钟被重启)未留下本地工作——worktree 干净;以下结论全部是本次会话重新查证得出的。 查重:重复 #4696(同症状+同机制+同根因: 证据链(均可复核):
为什么不动分支:rebase 只有两种结果——保留测试则 CI 必红(读不存在的文件);删掉测试+登记则 PR 变空 diff。两者都比现状差;原修复 commit( 结构化八问
收工判定:本 PR 与 #4696 重复(后到)且两者均 obsolete(修复目标已被 takedown 删除),无合并价值。agent 无关闭权限,请 owner 一并关闭 #4716 与 #4696。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
🔶 需要决策 本轮做了什么(auto-fix lane attempt 1/3)
红项情况(附带核实)
选项
默认(若未拍板):C —— 我不能关闭 PR(owner-only),也不会擅自复活被拆的安全控制。 8 问
|
[bot] 🏷 本轮(auto-fix lane attempt 1/3)已完成并停手,结论如下: 做了什么
结果 / 待办
|
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
1 similar comment
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 这是 auto-fix 车道的再次触发(re-trigger),状态未变——已现场复核(本 run 实测,非记忆):
为什么车道反复触发:PR 仍 open + dirty + 红项,auto-fix 车道的 stall 检测只看 checks 是否变绿,不因「已升级决策」而停,所以会反复 re-dispatch(floor 10/11、16、17/18 已多次 stalled / 达上限)。打破循环只能靠 owner 拍板:
完整选项 + 8 问见上方 floor 12(🔶 需要决策),此处不重复。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
1 similar comment
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 再次触发,状态未变(本 run 现场复核,非记忆): master 已推进到 冲突仍是 modify/delete(PR 要改的文件已被 owner 删除),无法机械 rebase——本轮不重复 rebase/push,也不重复贴完整选项(见 floor 12)。 打破循环只需 owner 拍板:A(推荐,按 obsolete 关闭 #4716 + #4696)/ B(重新武装 guard,需针对 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 第 4 次触发,状态未变。 本 run 现场复核:
冲突仍是 modify/delete(PR 要改的文件已被 owner 删除),无法机械 rebase——本轮不 rebase/push,不重复贴完整选项(见 floor 12)。 打破循环只需 owner 拍板:A(推荐,按 obsolete 关闭 #4716 + #4696)/ B(重新武装 guard,需针对 |
[bot] 🏷 第 5 次触发,状态未变。 本 run 现场复核:
冲突仍是 modify/delete,无法机械 rebase——本轮不 rebase/push,不重复贴完整选项(见 floor 12)。 打破循环只需 owner 拍板:A(推荐,按 obsolete 关闭 #4716 + #4696)/ B(重新武装 guard,需重新设计)/ C(保持打开,车道会继续反复触发)。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 第 6 次触发,状态未变。 本 run 现场复核:
冲突仍是 modify/delete,无法机械 rebase——本轮不 rebase/push,不重复贴完整选项(见 floor 12)。 打破循环只需 owner 拍板:A(推荐,按 obsolete 关闭 #4716 + #4696)/ B(重新武装 guard,需重新设计)/ C(保持打开,车道会继续反复触发)。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 第 7 次触发,状态未变。 本 run 现场复核:
冲突仍是 modify/delete(PR 要改的文件已被 owner 删除),无法机械 rebase——本轮不 rebase/push,不重复贴完整选项(见 floor 12)。 打破循环只需 owner 拍板:A(推荐,按 obsolete 关闭 #4716 + #4696)/ B(重新武装 guard,需重新设计)/ C(保持打开,车道会继续反复触发)。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
[bot] 🏷 第 8 次触发,状态未变。 本 run 现场复核:master modify/delete 冲突无法机械 rebase——本轮不 rebase/push,不重复贴选项(见 floor 12)。 说明:这是第 8 次重复触发,状态自 2026-11-13 起完全未变。车道反复触发是因为 stall 检测只看 checks 红不红,不因「已升级决策」而停。唯一打破循环的方式是 owner 拍板(A 推荐按 obsolete 关闭 #4716 + #4696 / B 重新武装 guard / C 保持打开)。 |
[ework] auto-fix stalled: test (windows-latest, 22, 4), test (windows-latest, 22, 1), test (windows-latest, 22, 2), test (windows-latest, 22, 3), test (ubuntu-latest, 22, 3), test (ubuntu-latest, 24, 3) — stopping for human review |
问题
bugfix-v*车道的 Lane leak guard 在任何一次干净的 merge 上都会静默红掉(exit 1、零输出)——没有泄漏 sha、没有::error::。首个真实触发是 #4684 carry merge(run 40191394364)。根因
探测管道里对每个 merge 的判定是一条
A && B && C链:当被检查的 merge 不是泄漏时,
--is-ancestor以 1 退出,成为循环体最后一次执行的状态;pipefail把它传成整个管道非零,set -e就在LEAKS=$(...)赋值处杀掉脚本——exit 1 且什么都不打印。之前一直绿只是因为范围内没有任何 merge(循环体从未执行)。更糟的次生面:即使存在真泄漏,只要它之后还处理到一个干净 merge(merge 列表按新→旧遍历),脚本同样静默死——泄漏证据行进了
$LEAKS却永远打不出来,守卫失去全部诊断价值。修复
把判定包进
if/then/fi——无 else 的if条件为假时返回 0,循环体不再向 pipefail 泄漏非零状态;真泄漏照常 echo 进$LEAKS,由后面的[ -n "$LEAKS" ]分支大声失败。守卫语义不变:真泄漏仍然红。行为变更(CI 守卫,旧值→新值)
no lane leaks)。回归测试
新增
tests/lane-leak-guard.test.ts:直接执行守卫真实的 run block(单一事实源,非副本)跑在一次性车道仓库上——干净 side-carry 车道必须放行;带 master merge 的车道必须大声失败并点名泄漏 sha。已在scripts/live-files.mjs登记(SPAWN_RE tripwire;spawn git+bash 子进程、不绑端口)。Windows CI leg 诚实 skip(守卫 runs-on ubuntu-latest,缺陷本质是 bash 的 pipefail/set -e 语义)。本地验证:修复版两场景通过;把 workflow 还原成旧的
&&链后测试立刻失败(clean lane must PASS (exit 0), got 1),证明断言有牙。Fixes #4695