Repository navigation
[PR] fix: reuse complete standing rules in host nudges - #6836
ZhaoJun233 wants to merge 8 commits into
Conversation
…omparison The responses/continuation case compares the default and continuation wire captures, but the ACP tags embed a wall-clock time= attribute stamped per request; the two runs are seconds apart so the deepEqual failed on the timestamp. Strip the time= attribute from both captures before comparing so the assertion checks only the continuation sentences, as intended. Fixes the flaky responses/continuation failure in ranxianglei#6836.
(ai: vllm-qwen/qwen3.8-27b) Verdict: sound direction, high quality. I found one must-fix flaky test — already fixed and pushed to the PR branch (commit Duplicate screening: not a duplicate. This is the fix PR for #6833; no parallel fix exists. What I did
The flaky test (fixed) Other findings (non-blocking)
Strengths
8 问(中文,供人工 reviewer)
Merge verdict: direction is right, quality is high, design is sound. The only blocker was the flaky test, which I've already fixed and pushed to the PR branch (commit |
8ec8bc8 to
dace643
Compare
|
回应这条评审,逐项说明:
最终提交为 |
(ai: vllm-qwen/qwen3.8-27b) 已逐项核对你在 我验证了什么
对你 6 点的核对
8 问(中文,供人工 reviewer)
合并判定:上一轮唯一阻塞项(flaky 测试)已修;本轮新增的 golden 与 G3 fake 改动我已独立核对,正确且必要;CI 全绿。非阻塞项(短提醒 echo 取舍、空行余量、anthropic slicing)维持记录。源码逻辑上轮已审、本轮零改动。可合并(待人工 review 确认)。 |
Conflict resolution (4 prepare-* lanes): keep the PR's renderHostNudgeText/withNudgeNotes standing-rule reuse, wired through master's new wireText/emitNudgeInjected nudge-debug plumbing; drop the now-unused direct renderNudgeText imports.
(ai: vllm-qwen/qwen3.8-27b) Merge conflict resolved and pushed. The PR is now What I did this run:
八问:
判定: 冲突已解决并推送( |
Conflict resolution: - tests/issue2929-codex-fold-double-miss.test.ts: take master's schedule-independent probe (subsumes the branch's cadence pinning — the hardcoded-index anchor it replaced is exactly what master's fix removes). - tests/golden/storage-render/*.json: regenerated from the merged code (digests reflect the union of both sides' state changes). - reference/architecture.md: dropped the duplicate responses-system-sections.ts map line (both sides added the same ranxianglei#6922 entry independently; kept master's, which is in its alphabetical slot).
(ai: vllm-qwen/qwen3.8-27b) Second conflict round resolved and pushed. The PR is again What happened since the last run: the contributor pushed What I did this run:
八问:
判定: 冲突已解决并推送( |
Resolve the architecture-doc module-ledger conflict (docs/architecture.md + .zh-CN.md): keep the PR's pipeline one-liner (standing-rule reuse / full fallback) and master's lanes one-liner (Pi Anthropic full-request compatibility) — a clean union of two adjacent-line edits. Verified: typecheck clean, PR host-nudge/prompt-cost/marker tests 74/74 green.
(ai: vllm-qwen/qwen3.8-27b) Conflict resolved — PR #6836 is now mergeable. I merged current master (
Verification before pushing (targeted, per local-testing discipline):
Push: fast-forward to the fork branch Result: PR 七问
判定:冲突已解决,PR 现可合并;CI 已在最终 head 上触发全量跑(当前无失败),待测试分片跑完转绿即为可合状态。 |
Master advanced (548e396..a446a3c) after the previous conflict fix, re-breaking the merge. The only conflicts were the 4 storage-render goldens, which BOTH sides had regenerated (PR standing-rule reuse vs master ranxianglei#6775 persisted fields). Resolved by regenerating from the merged tree (scripts/update-storage-render-goldens.ts) — the resulting digests match neither side, confirming the true combined behavior. Verified: storage-render golden test 5/5, typecheck clean, PR host-nudge/prompt-cost/marker tests 74/74 green.
(ai: vllm-qwen/qwen3.8-27b) CI engineer — conflict re-resolution (run 2). Master moved again since the previous conflict fix (548e396 → a446a3c, 29 new commits, incl. #6775 persisted-fields golden regen and kernel → v0.0.199), which re-broke the merge (state went back to What I did this run:
The PR is now 中文八问
收工判定:冲突已解决,PR 恢复可合并,等待 CI 全绿后由 owner 合并。 |
Master advanced again (5244ac4..6453fee, 21 commits, incl. ranxianglei#7149 batch2 storage-render golden regen for systemFp/canonicalSysFp 256B change-probe head, kernel -> 0.0.200), re-breaking the merge. Only conflicts were the 4 storage-render goldens, which BOTH sides had regenerated. Resolved by regenerating from the merged tree (scripts/update-storage-render-goldens.ts) — the resulting digests match neither side, confirming the true combined behavior. Verified: storage-render golden test 5/5, typecheck clean, PR host-nudge/prompt-cost/marker tests 74/74 green.
(ai: vllm-qwen/qwen3.8-27b) CI engineer — conflict re-resolution (run 3). Master moved again since the previous fix (5244ac4 → 6453fee, 21 new commits, incl. #7149 batch2 which regenerated the storage-render goldens for the new What I did this run:
The PR is now Note: this is the third re-resolution of the same golden conflict. The root cause is that master keeps regenerating these goldens while this PR sits open with its own regen. Each master move that touches the render/persist contract re-breaks the merge. If this keeps happening, the durable fix is to land this PR (or rebase it onto a fresh master at merge time) rather than repeatedly re-merging — but that's the owner's call, not something I should decide in an auto-fix lane. 中文八问
收工判定:冲突已解决,PR 恢复可合并,等待 CI 全绿后由 owner 合并。 |
Summary
Closes #6833.
Pressure nudges reuse complete rules already present in the actual outbound standing text. Missing or disabled rules retain their full fallback. A successful receipt confirms only the created blocks it explicitly identifies.
Evidence
Regression reasoning
The model may continue from a successful receipt only for the created blocks it identifies. Missing or ambiguous results and selecting new ranges still require acp_status; the wording cannot establish that every offered range was folded or carry an old ref ceiling into a later call. Rules absent from the actual standing text retain full fallback text. The current-base effective-range receipt fix (#6855) is preserved and its exact-string tests pass.
Merge Danger
Door: two-way
Blast Radius: prompts
Changes injected host text and receipt guidance. The continuation pack is a test fixture only. Kernel defaults, configured packs, tool-argument bytes and release version retain their contracts. Human review is required before merge.