Repository navigation
[PR] fix(wiring): degenerate-turn continuation retry joins the 429 governor (#4743) - #4802
Conversation
(ai: vllm-qwen/qwen3.8-27b) 查重: 不重复 —— 与 #4752(前序 PR,本 PR 声称 cherry-pick 其 ab6a7f1)、#4772(loop 车道其余三处 egress:preflight / compress-loop-responses / reasoning-guard)同属「429 治理器对 loop 车道出站失明」机制家族(#4743),但 egress 站点不同(degenerate-retry.ts 续拉),文件零重叠;#4752 若仍 open 则按先来后到应并入/关闭到本 PR,我核对中。 标签: pr + bug + scope/wiring + p3(与 #4743 floor 3 的分诊一致:当前无害——续拉有退化轮阶梯自限,危害面是持续 429 风暴下白烧上游名额)。 已拉取 head |
(ai: vllm-qwen/qwen3.8-27b) PR #4802 审核结论(八问)1. 是什么问题:退化轮续拉(degenerate-turn continuation refetch)是 loop 车道的一处出站发送,但对 429 治理器完全不可见——上游持续 429 时它照样打上游烧名额,已武装的 hold 也拦不住它。 2. 什么原因导致的:机制缺口而非实现错误。#4204 建治理器时只接了 relay 主道(src/server/relay.ts:821 门 / :1589-1590、:1637 观测); 3. 影响范围与严重程度:持续 429 风暴 + 恰好出现空轮退化(渲染标签回显等场景)时触发;单发续拉被阶梯自限(每轮至多一次),所以当前无害——危害面是风暴期白烧上游并发名额、且续拉的 429 判定无法武装 hold 帮下一轮主道止损。p3,与 #4743 分诊一致。 4. 怎么修复的:把续拉按「普通出站发送」接入治理器,双向对齐 relay 纪律——发送前过 5. 是否有回归问题(逐项审过的既有行为):
6. 是否破坏缓存:不涉及——不碰前缀缓存接缝、折叠账本、增量游标;只增加出站门与观测。 7. 是否改了设计方向:不涉及——沿用 #4204 治理器的既有契约与 relay 车道纪律,只是把一处遗漏的出站路径纳入同一机制(疏,不是堵)。 8. 是否引入了新的配置:无。 独立验证记录
一个需要 owner 处置的重叠#4752(review-findings wave,7 项修复)仍 open 且仍含 ab6a7f1——与本 PR 携带同一修复。按描述这是 owner 指示的摘出,但两 PR 并存意味着后合者会在 src/degenerate-retry.ts 冲突或变 no-op:#4802 先合 → #4752 需 rebase 丢掉该 commit;#4752 先合 → #4802 应关。agent 无权关闭任何 PR,请 owner 定合入顺序(建议:#4802 小而自洽先走,#4752 摘掉该 hunk 后继续)。 判定代码与行为审核通过,可合(auto-merge 门禁各项亦满足:单模块 wiring fix+回归钉、rebased head 绿、无 config/kernel/wire/identity 触碰、纯 fix:/test:、diff 干净、Fixes #4743);合并动作留给人,合并前等 CI test 车道终判 + 上面 #4752 重叠的顺序拍板。 |
📦 Built Package ArtifactBranch: Latest build — install this exact versionnpm install -g billion-context@0.0.6233-pr.4802.39dc1e7This exact version is immutable and reproducible. The rolling Recent builds (commit → version)
Download artifact
tar xzf billion-context-pr4802.tgz
npm install -g packageInstall instructions are refreshed on each push. |
#4743) The retry is an egress send: observe-side feeds noteUpstreamThrottle429/ Resolved like any main-lane send (one observation per request), and the gate answers locally under an armed hold instead of burning an upstream slot — passing the empty turn through preserves the client's stream.
75cbd71 to
795cd6d
Compare
📦 Merged Build PublishedThis merge to master was published as npm install -g billion-context@0.0.853-master.341e76c # this exact build
npm install -g billion-context@master # always the newest merged build
|
… declaration for lockfile-only churn kernel/package-lock.json is generated state, not kernel source. Agents' test prep (npm install inside kernel/, sweep-bot merges of stale lockfiles) churns it without any intent to change the kernel — 8 PRs (ranxianglei#4823 ranxianglei#4808 ranxianglei#4802 ranxianglei#4800 ranxianglei#4799 ranxianglei#4794 ranxianglei#4790 ranxianglei#4785) tripped the human gate on lockfile-only diffs, and the previous stopgap (bots appending kernel-change: declarations to PR bodies) was correctly rejected by the owner as bypassing the approval step. The human gate exists to protect kernel SOURCE. Rule 1 now ignores kernel/package-lock.json when deciding whether a PR 'touches kernel/'; real source/build-config changes still require the declaration + owner approval, and lockfile CONSISTENCY stays enforced by the separate lock-sync job (which fails on genuine drift — the ranxianglei#4725 merge red being today's live proof).
(ai: zhipuai-lb/glm-5.3)
Fixes #4743
这是什么
qwen 在 #4752 里七项修复中唯一没有随 PR #4725 进入 master 的一项,按 owner 指示直接摘出来:退化轮续拉(degenerate-turn continuation refetch,
src/degenerate-retry.ts)此前对 429 治理器完全不可见——重试风暴不会武装 hold,已武装的 hold 也照样烧一个上游名额。改动 = 原样 cherry-pick qwen 的 ab6a7f1(+15 行,无其他依赖):
noteUpstreamThrottle429(为下一轮主道发送武装),其它已收敛状态喂noteUpstreamThrottleResolved(解除)——与 relay 车道同样的"每请求一次观测"纪律。回归钉(本 PR 新增)
tests/issue4743-degenerate-refetch-429.test.ts:已验证:master 双红 / 本分支双绿;degenerate 家族(loop-degenerate-retry 7 项、issue2756、issue4725-loop-429-observe)全绿;typecheck 0 错。
边界