Repository navigation
[PR] Four-lane shared startup lifecycle wrap-up: dsh adopts lane mutual exclusion guard, thick lifecycle retained in place (# | 四车道共享启动生命周期收尾:dsh 采用车道互斥守卫,厚生命周期保留原地(#5241 阶段 1 / PR-1d) - #5248
ranxianglei wants to merge 2 commits into
Conversation
…led (#5248) The bundle patch's static 'compaction-basic -> auto:false' line kept applying whenever the billion-context bundle was mounted — including while bili-native was disabled or dead (no process verdict). Non-web profiles therefore lost their native auto-compaction permanently after a market disable; disabling no longer reversed to stock as documented in #3662. The gate transform now undoes exactly that line when no active verdict exists: only the host-plane compaction-basic entry, only when the patch armed it (auto === false). The declarative line stays in the patch as a fail-safe (gate entry fails to load while bili-native loads => host plane stays stood down). A user's own manual auto:false on that row is indistinguishable at this layer and is restored too (documented edge); if a dsh build never fires the internal/config hook for that entry, this degrades to the old behavior. Closes #5248
…tion Resolve the #5994 merge conflict in docs/clients.zh-CN.md by taking the union of both intents: keep this branch's #5248 host-plane restore clause in the launcher bullet, and take master's #5838 Codex-Responses-WebSocket updates (Profile-install bullet + two new bullets) verbatim. No code was touched — the only hand-resolved file is markdown; all four PR code/test files are byte-identical to the pre-merge head.
6052fa7 to
872e45e
Compare
#5241 phase 1, PR-1d) Final slice of the approved phase-1 plan. dsh does NOT migrate onto the shared native-attach.ts lifecycle — closing the loop on the plan's "dsh's extras go through spec hooks" with what the code actually shows: dsh's verifyAttachAndRecover is a thicker state machine, not a parameterization of the thin one. #3616 world-generation checks sit at different points per branch (landings check giveUpSeq; the spawn landing checks ONLY the gen — register), #3544 rotation emits client events before any staleness check, and the register — not the env — is dsh's publish surface. Branch-hook transposition would spread one coherent state machine across two files with subtly mismatched check points. What dsh DOES adopt from the shared module: armNativeLane("dsh") at its arm point (apply() — the plugin lifecycle owns the lane; re-activation of the same lane stays legal), making the one-lane-per-process contract explicit on all four lanes. Both files now cross-reference the deliberate thin/thick split so nobody "finishes" the migration by accident. The divergence stays frozen by issue3544 (20/20) and the phase-0 stakes (3/3, untouched).
c429f65 to
81fb1dc
Compare
[bot] CI 工程师冲突处理完成 — PR #5248(head 分支 冲突原因(先一句白话):这不是代码逻辑冲突,是堆叠 PR 的 base 漂移。base 分支( 怎么修的:把 head 独有的两刀 dsh commit cherry-pick 到当前 base 上,丢弃 head 里那三个已被 base 收编的旧 pi/omp/opencode commit:
唯一一处冲突在 dsh-native.ts 的 import 区:base 的 native-intercept import 行已演进( 结果:
八问:
判定:冲突已解,CI 绿,mergeable=clean,可合。 合并顺序约束不变(须排在 #5242 → #5244 → #5246 → #5247 之后);合并动作留给 owner。 |
[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b) CI 工程师冲突处理完成 — PR #5248(head 分支 冲突原因(先一句白话):这不是代码逻辑冲突,是堆叠 PR 的 base 漂移。base 分支( 怎么修的:把 head 独有的两刀 dsh commit cherry-pick 到当前 base 上,丢弃 head 里那三个已被 base 收编的旧 pi/omp/opencode commit:
唯一一处冲突在 dsh-native.ts 的 import 区:base 的 native-intercept import 行已演进( 结果:
八问:
判定:冲突已解,CI 绿,mergeable=clean,可合。 合并顺序约束不变(须排在 #5242 → #5244 → #5246 → #5247 之后);合并动作留给 owner。 |
…missed (ranxianglei#7112) 8461f55 moved the entry-like object to the first parameter in most mock calls but left two issue3662 sites still passing it as `this` (mw.call(PRESET_SELF, null, next)) — they only stay green because their assertions are name-independent, so the broken binding survives exactly where a future name-keyed branch (e.g. ranxianglei#5994's ranxianglei#5248 restore) would be exercised. Move those two calls to the real binding and rename the identifiers that now lie (PRESET_SELF/self/raw → the fiber they carry), so the mocks cannot silently drift back to the pre-ranxianglei#7112 convention.
cordis dispatches `internal/config` with `this` bound to null and the Fiber as the first listener argument (a string event name never becomes a thisArg). The #5248 restore-auto check read `this?.entry?.options?.name`, which is therefore always undefined, so the host-plane compaction-basic `auto:false` line was never undone after a bili-native disable — #5248 was a no-op. The #4147 telemetry entry name suffered the same (always "unnamed-entry"). Read the entry name from the first param (matching bili's own CompactionDisableHost.on listener type `(raw, next)` and the dsh-native.ts handler convention). The tests now dispatch the middleware the way cordis does — `mw.call(null, fiber, next)` — so the #5248 case reproduces the original no-op and pins the fix.
…ore path Four unqualified "off everywhere" claims (README en/zh, docs/clients en/zh) contradicted this PR's own behavior: a disabled bili-native restores stock dsh auto-compaction (static auto:false flipped back to auto:true by the gate). Each note now scopes the claim to "while bili-native owns the lane" and points at the restore (#5248).
The PR was authored against the e-work mirror, where the user issue is #5248; on GitHub the user issue is #5245 (GitHub #5248 is an unrelated open PR). All 18 in-PR references (docs en/zh, code comments, patch yml comment, test names) now use the GitHub number so they resolve to the right thread. The PR body's 'Closes #5248' line is the author's to fix.
(ai: zai/glm-5.3)
Refs #5241(阶段 1 / PR-1d,不 Closes)|叠在 #5247 之上(合并顺序:#5242 → #5244 → #5246 → #5247 → 本 PR)
这个 PR 做什么:阶段 1 的最后一刀,也是对方案的一处诚实修正:dsh 不迁移到共享实现,只采用共享的车道互斥守卫
armNativeLane("dsh")(挂在 apply() ——dsh 的车道归插件生命周期所有,同车道重新激活合法)。至此四条车道都被 one-lane-per-process 契约显式覆盖。为什么 dsh 不迁(原方案说"独有差异走 spec 钩子",实施时发现钩子化不成立):
proxyEnvOrigin()把临时 origin 冻结进 BILLION_CONTEXT_PROXY,绕过 ensureProxyRunning() 的 instance 验活;工具调用全部 fetch failed,需重启宿主 #983/release v0.1.176 #1783 自愈契约要求迟到的 spawn 落地能给已放弃的 register 重新定基);安装新版本后旧代理永远不换新:detach 代理躲过应用退出,重启只是重新挂上旧进程(「永远更新不了」) #3544 轮换在任何过期检查之前就发客户端事件;dsh 的发布面是 register 而不是 env;验收:issue3544(dsh 轮换全套)20/20、issue4811 9/9、issue4755 1/1、桩矩阵 3/3 一行未改、守卫单测 3/3、tsc 干净。dsh verify 逻辑体零改动(diff 只有 import + apply() 里 5 行守卫 + 注释)。
阶段 1 至此四刀齐:PR-1a pi(#5244)→ PR-1b omp(#5246)→ PR-1c opencode(#5247)→ PR-1d dsh(本 PR)。合完这批,#5241 可进阶段 2(闩锁治理:shadow 三振闩/stderr-dead 闩的可告警可恢复有 TTL 化,桩在 #5242 已冻结现状)。