Repository navigation
[PR] Step 2 of the Four-Lane Shared Startup Lifecycle: OMP Lane Migration In (#5241 Phase 1 / PR-1b, pure move) | 四车道共享启动生命周期第二步:omp 车道迁入(#5241 阶段 1 / PR-1b,纯搬运) - #5246
Conversation
(ai: vllm-qwen/qwen3.8-27b) 查重: 不重复。 本 PR 是伞 issue #5241(宿主契约 v2)阶段 1 已批准方案的切片 PR-1b(第二刀),兄弟切片为 #5242(桩矩阵)/ #5244(PR-1a pi)/ #5247(PR-1c opencode)/ #5248(PR-1d dsh)——刻意切片而非并行重复工作;无其他 open 条目覆盖「omp 车道 attach 生命周期迁移」。 标签: omp + scope/wiring + p3(纯搬运重构,行为字节级不变,无外部影响)。 审核进行中:代码级等价性审查已完成(被删 omp 代码 vs 共享模块 + spec 钩子逐分支比对);CI 截至 16:19Z 仍 14/14 queued。CI 结果出来后单独发最终结论。 |
(ai: vllm-qwen/qwen3.8-27b) PR 审核结论:可合(CI 全绿 + 代码级等价性逐分支验证通过)结构化八问1. 是什么问题:不是修 bug,是计划内重构切片——四车道的启动 attach/fallback 逻辑( 2. 什么原因导致的:历史手抄——各车道当年各自实现同一套探测/attach/fallback/spawn 逻辑,缺单源。打桩阶段还挖出一个没写进任何文档的隐含契约:「一个进程只装一条 native 车道」(四条车道抢同一个 3. 影响范围与严重程度:纯内部重构,零外部用户面影响。生产行为不变(桩矩阵背书 + CI 绿)。唯一新行为: 4. 怎么修复的:共享模块以 5. 是否有回归问题:既有行为逐项审过——
6. 是否破坏缓存:不涉及。不碰前缀缓存、重试策略、增量游标、去重键,不碰 wire 消息形状。 7. 是否改了设计方向:没有转向——这是已批准阶段 1 方案(生命周期单源化)的执行本身。「一车道一进程」从隐含假设变为显式契约属于方案设计目标,不是漂移。 8. 是否引入新配置:无。没有新 env/config key/默认值。 行为变更披露(Deliverables 第 4 条)唯一变化: 过程观察(不阻塞,请 owner 知悉)#5241 线程里阶段 1 方案稿(14:48Z)明确写「owner 批准后才动工」,41 分钟后(15:29Z)四刀全部开出并称「按批准的方案 A」,但我在 GitHub 线程里找不到显式的 owner 批准评论(伞 issue 仅那两条评论,#5244/#5246 评论数为零)。若批准发生在其他渠道,忽略本段;否则建议补一句记录,免得「先批准后动工」的规矩留个证据缺口。 判定可合。 CI:head |
…lling back to 272K (#5246) Codex resolves its live model table from exactly one path, <CODEX_HOME>/models_cache.json. On installs driven by a custom catalog (config.toml `model_catalog_json = ...`) that file does not exist, so bili fell through to the bundled snapshot (no entry) and the flat 272K floor, clamping the effective window far below what codex actually perceives and triggering emergency nudges at ~35% of the real window. - Parse `model_catalog_json` from codex's own config.toml and resolve the live table from that path when set, else models_cache.json (relative paths resolve against CODEX_HOME). - When neither file is readable but config.toml sets `model_context_window`, size from that value capped by the known max_context_window (the bundled entry's max, or the 272K unknown-model ceiling) instead of the flat 272K floor — never budgeting above what codex perceives — and log a warn naming the degraded path. - Name the winning window source (client-report/catalog-json/models-cache/config-context-window/bundled-snapshot/flat-fallback) in the clamp log line instead of the misleading "current client metadata preferred" text. Local codex peers on such installs now get the real perceived window (toward larger, never below codex perception); remote peers, non-codex clients, operator modelContextLimit, min() semantics and output reservation are unchanged. Closes #5246
47b2656 to
2b68520
Compare
…phase 1, PR-1b) Second lane migration: omp's verifyAttachAndRecover swaps its private copy for the shared native-attach.ts lifecycle via a NativeLaneSpec, exactly as pi did in PR-1a (#5244). Pure transposition — the phase-0 stake matrix (tests/contract-v2-stake-verify-attach.test.ts) passes untouched. omp specifics preserved through spec hooks instead of being silently unified: every origin write funnels through omp's publishOrigin() so a test-pinned probe base (_setOmpOriginForTest) survives a mid-suite attach verify / respawn landing, and the fallback branch's state clear routes through the same guard — hence the new optional clearOrigin spec hook (default remains the direct state.origin = undefined the other lanes use). armNativeOmp now calls armNativeLane("omp"): the one-lane-per-process contract (BILLION_CONTEXT_PROXY + fetch-intercept slot are per-process singletons — #5242 phase-0 stakes) is enforced for both migrated lanes. opencode/dsh keep their own copies until PR-1c/1d; their suites stay green untouched (issue3544 20/20, opencode-native 65/65).
eee5f58 to
3e15f19
Compare
(ai: vllm-qwen/qwen3.8-27b) Conflict resolved and pushed. The PR was What I did this run:
Result: PR #5246 is now 八问(结构化审核结论)
判定:冲突已解决,PR 现为 mergeable;本地 typecheck + 定向测试全绿,CI 在新 head 上重跑中(镜像缓存当前 0 失败 / 0 pending)。可合(待 CI 全绿确认)。 |
(ai: vllm-qwen/qwen3.8-27b) 进度汇报(强制重启后)——工作已完成,无丢失,无阻塞。 进程重启没有丢失任何进度。我刚才已重新核验实时状态:
已完成内容(回顾):stacked-PR 冲突(omp 分支钉在旧 pi 提交 无问题 / 无阻塞。 PR 是逐字节等价的纯搬运,已全绿,可合(待人工合并)。我无法合并 PR——系统规则禁止 agent 合并,请自行合并:#5246 |
…5241 phase 1, PR-1c) Third lane migration: opencode's verifyAttachAndRecover swaps its private copy for the shared native-attach.ts lifecycle via a NativeLaneSpec, as pi (#5244) and omp (#5246) did. Pure transposition — the phase-0 stake matrix passes untouched. opencode specifics preserved through spec hooks: the historical hyphenated `bili-native-opencode:` log prefix stays byte-for-byte via the new optional `tag` spec field (default remains `bili-native(<lane>)` — pi/omp messages unchanged). armNativeOpencode now calls armNativeLane("opencode") — the one-lane-per-process contract covers attach/spawn/inline modes alike. issue3304's cross-lane matrix deliberately co-loads TWO lanes in one test process; it now resets the guard between the dynamic imports (_resetArmedLaneForTest) — the guard encodes the production contract, and a test that consciously co-loads lanes opts out explicitly instead of the old silent cross-pollution.
(ai: zai/glm-5.3)
Refs #5241(阶段 1 / PR-1b,纯搬运,不 Closes)|叠在 #5244 之上(合并顺序:#5242 → #5244 → 本 PR)
这个 PR 做什么:按已批准的阶段 1 方案做第二刀——omp 车道的
verifyAttachAndRecover换成共享模块native-attach.ts调用(和 #5244 的 pi 完全同构)。纯搬运,行为一字节不变,#5242 桩矩阵一行未改 3/3 全绿。omp 特有语义通过 spec 钩子保留(不是抹平):
publishOrigin()(带测试钉保护:_setOmpOriginForTest钉住的探针基座要能在套件中途的 attach verify / respawn 落地时幸存)——spec.publish 直通它;NativeLaneSpec加了可选clearOrigin钩子(缺省=其他车道的直接state.origin = undefined,pi 行为不变)。改动:omp-native.ts -67 行(换 spec + 一行转发);native-attach.ts +clearOrigin 可选钩子;
armNativeOmp加armNativeLane("omp")车道互斥守卫(现在 pi/omp 两条已迁车道都被显式约束)。验收:omp-native 23/23、omp-msgids 7/7、omp-native-incremental 5/5、issue3304 23/23(omp+opencode 同进程——opencode 尚未加守卫,PR-1c 时处理)、桩矩阵 3/3 未改动、issue3544(dsh)20/20、pi-native 19/19、tsc 干净。
切片:PR-1a(#5244,已开)→ PR-1b(本 PR) → PR-1c(opencode)→ PR-1d(dsh,#3544 轮换等独有差异走 spec 钩子)。base 叠在 #5244 分支上,合并后自动 retarget。