Skip to content

[PR] ci: converge master-CI fixes (persist restamp guard + lockfile version sync) (#4599) - #4814

Merged
ranxianglei merged 4 commits into
masterfrom
ci-fixes
Oct 27, 2026
Merged

ranxianglei merged 4 commits into
masterfrom
ci-fixes

Conversation

@ranxianglei

@ranxianglei ranxianglei commented Oct 26, 2026 •

Copy link
Copy Markdown
Owner

(ai: vllm-qwen/qwen3.8-27b)

Persistent fleet convergence branch per owner strategy 2026-10-25 — all master-CI fixes land here first; PRs merge origin/ci-fixes into their heads instead of fixing master-level failures themselves. Recreated after #4727 was closed while stale-empty.

Commits ahead of master (931c66a2f):

  1. cdac1c099 fix(persist): stop the ledger restamp from materializing empty CCR stores (CI Control Center: Centralized CI Failure Handling & Status Sync (Comment all CI issues here; do not open new issues) | CI 总控: CI 失败集中处理与状态同步(所有 CI 问题在此评论, 勿开新 issue) #4599) — bisect-proven root cause of the master red on tests/storage-unified.test.ts (introduced by a4a17cb86/Ledger re-stamp (restamp) never re-keys the CCR content store — forked CCR sessions 409 forever, decompress can serve ANOTHER message’s original #4733 via the [PR] chore: empty PR (no changes) #4725 vehicle): contentStoreOf() get-or-materializes an empty envelope for storeless sessions during cold-load ledger alignment, drifting the full-mode parity digest. Guarded call site: storeless sessions keep pre-Ledger re-stamp (restamp) never re-keys the CCR content store — forked CCR sessions 409 forever, decompress can serve ANOTHER message’s original #4733 shape; stored sessions re-key unchanged. Targeted local: storage-unified 14/0/1 (was 12/2/1), issue4733 suite green, kernel ccr-restamp green, typecheck clean.
  2. dfadc21b3 fix(ci): sync lockfile recorded versions with acp-kernel 0.0.165 (CI Control Center: Centralized CI Failure Handling & Status Sync (Comment all CI issues here; do not open new issues) | CI 总控: CI 失败集中处理与状态同步(所有 CI 问题在此评论, 勿开新 issue) #4599) — window commits 293ae65/de5e03659 bumped kernel/package.json without regenerating lockfiles; lock-sync re-resolution rewrites root 0.0.163→0.0.165 and kernel 0.0.164→0.0.165. Pure recorded-version sync, no dependency change.

Merge is owner-only.
kernel-change: lockfile-only recorded-version sync — commit dfadc21 updates root package-lock.json (acp-kernel 0.0.163→0.0.165) and kernel/package-lock.json (0.0.164→0.0.165) to match kernel/package.json after window commits 293ae65/de5e03659 bumped the version without regenerating locks. No kernel/src change, no kernel version bump; declaration required because the diff touches kernel/. (#4599)

master window commits 293ae65/de5e03659 bumped kernel/package.json to
0.0.165 without regenerating the lockfiles; lock-sync re-resolution then
rewrites the stale recorded versions (root 0.0.163, kernel 0.0.164) and
fails. Pure recorded-version sync via npm install --package-lock-only;
no dependency or semantic change.
@github-actions

github-actions Bot commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor

📦 Built Package Artifact

Branch: ci-fixes (d7f5159)

Latest build — install this exact version

npm install -g billion-context@0.0.6273-pr.4814.9e84105

This exact version is immutable and reproducible. The rolling pr tag tracks the newest test build across all PRs.

Recent builds (commit → version)

commit version build
d7f5159 billion-context@0.0.6273-pr.4814.9e84105 build
1eb592a billion-context@0.0.6209-pr.4814.6b8bf6e build
dfadc21 billion-context@0.0.6128-pr.4814.1cc6205 build

Download artifact

  1. Download the artifact from the Actions run
  2. Extract the tarball and install:
tar xzf billion-context-pr4814.tgz
npm install -g package

Install instructions are refreshed on each push.

@ranxianglei ranxianglei changed the title ci: converge master-CI fixes (persist restamp guard + lockfile version sync) (#4599) [PR] ci: converge master-CI fixes (persist restamp guard + lockfile version sync) (#4599) Oct 26, 2026
…r a send-failure give-up (#4599)

#4516 (bc50f1a) replaced the post-give-up warn log with a state write that
clobbered the 'send-failed' register value, breaking #4125's pinned contract
(the register must stay 'send-failed' after a send-failure give-up). The
user-facing intent of #4516 — accurate oversized-refusal wording — is kept by
mapping 'send-failed' onto the dead-equivalent sentence in fallbackOversizeRefusal.
Master absorbed this branch's fix with refinements (#4824: the send-failed
register contract + the #4516/#4125 wording); taking master's side leaves
the branch with no remaining diff vs master.
@ranxianglei

Copy link
Copy Markdown
Owner Author

(ai: zhipuai-lb/glm-5.3)

冲突已解(分支已并入最新 master,d7f51592)。解的过程中确认:这个分支的全部有效内容 master 已经带着了——send-failed 寄存器契约与措辞以 #4824 的精炼版进了 master(经 #4807 链),lockfile 也已被 kernel 0.0.166 的再生版本覆盖。合并后本 PR 对 master 的 diff 为空。

建议:直接关闭本 PR 即可,无需合并(内容零丢失)。要留痕的话 close reason 写「已被 #4824 吸收」。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

独立复核了「内容已被 master 吸收、应关闭不合并」的结论——成立,且实测证明合并反而有害。证据(对当前 master 2eee31562 重新验证,未照抄上一条):

  1. 分支独有提交只剩一个。ci-fixes(d7f51592)相对当前 master 只有两个提交不在 master:merge 提交本身 + f5939a1d9(send-failed 寄存器修复)。PR 的 persist restamp guard(cdac1c099)与 lockfile 同步(dfadc21b3)都已在 master;lockfile 之后还被 [PR] The compress tool only teaches a single invocation format, to prevent the model from mixing up multiple formats. | compress 工具只教一种调用格式,防止模型把几种格式混着用 #4823 链推进到 kernel 0.0.167 并同步了记录,比本分支的版本更新。
  2. f5939a1d9 的功能内容被 Two existing red tests on master are masked by CI sharding: #4125's give-up reason is preempted by #4516's dead override | master 上两个既有红测试被 CI 分片藏住:#4125 give-up 理由被 #4516 的 dead 覆写抢跑 + #1365 attach 超时 #4824 精炼版完整覆盖。master 的 src/agent/native-intercept.ts:608 已是 reason === "dead" || reason === "send-failed"(Two existing red tests on master are masked by CI sharding: #4125's give-up reason is preempted by #4516's dead override | master 上两个既有红测试被 CI 分片藏住:#4125 give-up 理由被 #4516 的 dead 覆写抢跑 + #1365 attach 超时 #4824 注释);两处 give-up 路径(:1300 fetch 路径、:1512 respawn 路径)只写 "send-failed",全文件再无 lastUnavailableReason = "dead" 覆写。[Bug] Plugin bootstrap spawns a new instance while the old one still holds the port and drops proxying (goes direct): la | [Bug] 插件 bootstrap 在旧实例仍占端口时新起实例并放弃代理(goes direct):大会话随即以未压缩历史撞上游上限(400 Range of input length / 413) #4125 寄存器契约与 [pi] Direct connection fallback after proxy disconnect: no oversized rejection, no self-healing, no visible alerting (al | [pi] 代理失联后的直连兜底无 oversized 拒绝、无自愈、无可见告警(opencode/dsh 都有)—— 1.06M token 原始历史被直接送进上游 #4516 措辞意图都在。
  3. rebase 实测:git rebase --stat origin/master origin/ci-fixes 只剩 f5939a1d9 一条需要重放,且恰在 native-intercept.ts 上冲突——冲突原因就是 master 已有更优版本。若强行合并本 PR,会把旧措辞盖回 Two existing red tests on master are masked by CI sharding: #4125's give-up reason is preempted by #4516's dead override | master 上两个既有红测试被 CI 分片藏住:#4125 give-up 理由被 #4516 的 dead 覆写抢跑 + #1365 attach 超时 #4824 精炼版,是负收益,不是空操作。

八问

  1. 是什么问题:CI 收敛分支在 master 推进后已无独立有效内容,继续挂着会误导后续 merge。
  2. 什么原因导致的:master 经 [PR] fix(#4797): root-cause fix for superseded live-key collision — restamp pruning + semantics-preserving guard translation | fix(#4797): superseded 活键碰撞根治——restamp 剪枝 + 守卫保义翻译 + 一次性标志修复 (kernel 0.0.166) #4807→Two existing red tests on master are masked by CI sharding: #4125's give-up reason is preempted by #4516's dead override | master 上两个既有红测试被 CI 分片藏住:#4125 give-up 理由被 #4516 的 dead 覆写抢跑 + #1365 attach 超时 #4824 链已带上本分支全部修复(且含更精炼版),分支落后 master 20 个提交。
  3. 影响范围与严重程度:无运行时影响;仅仓库状态卫生问题(一个实质为空的 PR 头挂在 ci-fixes 哨兵分支上)。
  4. 怎么修复的:不改代码——关闭 PR,close reason 记「已被 Two existing red tests on master are masked by CI sharding: #4125's give-up reason is preempted by #4516's dead override | master 上两个既有红测试被 CI 分片藏住:#4125 give-up 理由被 #4516 的 dead 覆写抢跑 + #1365 attach 超时 #4824 吸收」。
  5. 是否有回归问题:不涉及(零代码变更;反向验证了「合并」才会造成措辞回归,故结论是不合并)。
  6. 是否破坏缓存:不涉及。
  7. 是否改了设计方向:不涉及。
  8. 是否引入了新的配置:不涉及。

判定:同意上一条建议——关闭本 PR,不合并(内容零丢失,合了反而倒退)。按规矩 agent 不执行关闭动作,请 owner 关闭。github-actions 的构建产物评论是自动刷新,无需处置。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant