Repository navigation
[PR] batch-2: 4 held Afloat16 fixes (2 as-is, 2 with review-patch commits) - #7101
Merged
Merged
Conversation
(cherry picked from commit ccfd44a)
(cherry picked from commit b20d51a)
(cherry picked from commit a851549)
…ocalPath The tunnel-side fix stops enumerating 127.0.0.x in localMachineIps() (classifyIp covers the range now), but selfAddressedLocalPath still relies on the interface set — an absolute-form self request via an unconfigured alias such as 127.0.0.5:selfport would fall through to tunnel classification and 403 instead of being served locally. (cherry-pick pending: proposed fix for PR #7022) (cherry picked from commit 9f594c159dfb824d2430c91fbca951bcb689c1a1)
(cherry picked from commit 1c936ed)
close fires when the listener stops accepting, i.e. before the session flush in finishDrain. Removing the handlers there left a second Ctrl+C during the flush window unhandled — the process died with unflushed compression state. Skip removal while shuttingDown; a closed embedded server that never shut down (port-ladder retry) still cleans up. (cherry-pick pending: proposed fix for PR #7026) (cherry picked from commit 6b7865d847e7da14817b6bc5e563c9fd1f630fde)
Contributor
📦 Built Package ArtifactBranch: Latest build — install this exact versionnpm install -g billion-context@0.0.10695-pr.7101.bebf047This exact version is immutable and reproducible. The rolling Recent builds (commit → version)
Download artifact
tar xzf billion-context-pr7101.tgz
npm install -g packageInstall instructions are refreshed on each push. |
Contributor
📦 Merged Build PublishedThis merge to master was published as npm install -g billion-context@0.0.1229-master.0e475ce # this exact build
npm install -g billion-context@master # always the newest merged build
|
This was referenced Nov 18, 2026
Merged
Open
Open
ranxianglei
pushed a commit
that referenced
this pull request
Nov 18, 2026
…lict at 0.0.200 Master advanced past the PR base again (batch11 wave11 #6827, lean-compress receipt #7105, wire-client-sidecars #7083, p1 batch b2/b3, #7087, #7101 -> kernel 0.0.199, storage-render goldens regenerated for #6775 persisted fields, 400 files). Content hunks auto-merged (kernel/src/compress.ts, kernel/src/types.ts, all four storage-render goldens); the only conflicts were the three kernel version lines, resolved at 0.0.200 = master's 0.0.199 + this PR's kernel/src change, per the CI-enforced kernel version discipline. Targeted local verification: tests/golden-storage-render.test.ts 5/5, tests/storage-state-fields.test.ts 2/2, kernel issue6116/issue3769/ hide-consumed suites 27/27.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
batch-2: Afloat16 评审保留的 4 个修复(2 个原样 + 2 个原版带评审补丁)
接 #7074(已合并的 20 个小修复),把评审时保留待讨论的 4 个 PR 收进来。#7038 按讨论打回,不在此列。
每个修复是干什么的
原样收(评审通过,Afloat 原始 commit 未动)
network.caFile/NODE_EXTRA_CA_CERTS)后,合并信任集的底座原来只用 Node 内置 Mozilla 包,不含系统 CA / 程序注入的 CA——undici 的connect.ca是替换语义,配完 caFile 后其他信任源反而全失效。改成以 Node 实际生效的信任集(22.15+ 的tls.getCACertificates("default"),旧 Node 回退内置包)为底座再叠加,配与不配两条路径的信任一致。thoughtSignature(逐字节校验)。原来会剥这段文本里的 ACP 标签 → 客户端回传验签失败 → 会话 400 断。三层(压缩循环 / 非流式 JSON / 客户端流式)统一"带签名的 part 原样放行",与 thought part 既有裁决(#1960)一致。两个边角已在 #6845 评审记录在案:签名 chunk 含 ACP 垃圾会原样漏给客户端(被迫接受);签名晚于文本 chunk 到达时该 turn 最坏一次显式 400(代理层不可修,另行跟进)。原版 + 评审补丁(每 PR 2 个 commit:Afloat 原版 + 我 1 个补丁 commit)
::1(原来只枚举 127.0.0.x 和接口 IP)localMachineIps()两个消费方之一:selfAddressedLocalPath(绝对形式自请求的本地路由)没跟上 →http://127.0.0.5:selfport/...这类未配置别名从"本地自服务"变成误判 403src/server.ts的 mine 判定加classifyIp(host)==="loopback"+ 2 条回归测试(不修红/修了绿)close在"监听器停止接收新连接"时触发,早于会话 flush(finishDrain,可数秒)——此刻处理器已被移除,flush 窗口里第二次 Ctrl+C 无人处理,进程直接死掉、压缩状态没 flush 完removeProcessHandlers在shuttingDown期间跳过移除(进程反正要 exit(0),handler 留着正合适;嵌入式 server 未走 shutdown 的 close 路径如端口阶梯重试仍照常清理)+ 1 条回归测试(不修红/修了绿)著作权
-xtrailer 可溯源),作者、内容未动selfAddressedLocalPathguard(4d63c02)、[PR] fix: release process handlers when an embedded server closes #7026 的 flush 窗口 guard(894835a),各自带回归测试验证
ci:full标签触发)合并后
#6845 #7004 #7022 #7026 可按 superseded 关闭(后两个的完整内容 = 本分支的"原版 + 补丁",合本 PR 即收全)。
Fixes #6842
Fixes #7003
Fixes #7019
Fixes #7025