Repository navigation
[PR] fix: preserve terminal content rejections and reported usage - #6835
ZhaoJun233 wants to merge 8 commits into
Conversation
(ai: vllm-qwen/qwen3.8-27b) 查重: 不重复。检索 open+closed 的 issue/PR,无其他内容拦截判定(content-blocked / agent_router_content_blocked)修复在途;仅本 PR 与两条无关的已关闭项。 Review of PR #6835 (draft): I checked out the branch, ran typecheck (clean), the new test file (12/12 pass), the modified loop/adapter/wire-contract suites, and read the full diff. Remote CI is all green (30 checks, 0 failed, 0 pending — all test shards windows+ubuntu × node 22/24, static-gates, mysql-contract, unused-exports). What I verified locally:
One note on local test failures (not a PR regression): running the modified loop suites against the shared on-disk session store produced 5 failures in tests/loop-compress.test.ts. I confirmed these are environment, not code: (1) the same 4 pre-existing tests fail identically on the base commit 2e3cfc9; (2) in a clean Code cleanliness (external-contribution bar): naming is clear, no dead code, no duplication (single Verdict: mergeable once the draft is finalized. The fix is correctly scoped to the root cause (the recovery paths had no way to distinguish an explicit content verdict from an ordinary validation error), narrow enough to avoid false positives, well-tested, and CI-green. 结构化八问(中文):
判定: 可合(draft 定稿后)。 |
|
回应这条评审,逐项补充当前状态:
|
(ai: vllm-qwen/qwen3.8-27b) 逐条确认,并采纳第 4 点对我八问 #6 的澄清。
判定维持:可合。 修复打在根因上(恢复路径无法区分显式内容判定与普通校验错误),范围窄、测试有牙、CI 全绿、外部贡献整洁度达标。合入由维护者决定。 |
…lict) Single conflict: tests/issue2929-codex-fold-double-miss.test.ts. Master rewrote the ranxianglei#2929 fold probe to be schedule-independent (245ecb1, 7247410) after this PR's last master-sync; the PR's latest CI commit (86c0790) had pinned the same nudge cadence via NUDGE_GROWTH_TOKENS + kernelConfig nudge tuning on the old fixed-index structure. Resolved by taking master's schedule-independent probe verbatim — it subsumes the PR's determinism goal and is the tested CI-green baseline. The PR's content-rejection fix (parseContentRejection + recovery-path gating) is fully preserved in the cleanly-merged src files. Verified: typecheck clean; issue2929 probe passes; content-rejection-compat 12/12 pass.
(ai: vllm-qwen/qwen3.8-27b) CI conflict resolved for PR #6835 — merge state What I did this run
The conflict (semantic, one test file) —
Current state
No design decision needed, no new issue, no labels. Waiting on CI. 结构化八问
判定:冲突已解决并推送( |
[ework] CI fix verified green ✓ |
2 similar comments
[ework] CI fix verified green ✓ |
[ework] CI fix verified green ✓ |
…2nd conflict) Master advanced 6a641f3..4b77eab (~40 commits, incl. Pi Anthropic full-request compat, preflight egress-fuse fold, cache-mark pinning) after the prior conflict resolution. Re-merged the new master. Conflicts (2, both auto-generated architecture docs, module-ledger hunk): - docs/architecture.md + docs/architecture.zh-CN.md: the pipeline row one-liner (PR: 'terminal content rejection / usage' vs master: 'handle / prepare-* / relay / inject') and the lanes row (master added 'Pi Anthropic full-request compatibility'). Resolved by union: kept master's structural pipeline description + the PR's behavior note, and took master's lanes row (superset). All src/loop/* (adapter-anthropic/google/openai/responses, core.ts) and tests/loop-compress.test.ts auto-merged cleanly; the PR's content-rejection fix (parseContentRejection + recovery-path gating) is fully preserved. Verified locally: typecheck clean. The 7 loop-compress.test.ts failures are environmental (Node v22.23.2 sandbox) — they fail identically on master alone (6) and on the PR head (5, incl. the PR-added content-rejection test); both CIs are/were green on GitHub. The merge's failure set is exactly the union of those; zero new failures introduced. PR's content-rejection-compat suite passes 12/12; issue2929 probe passes.
Master advanced 4b77eab..548e396 (3 commits: wire-client sidecars ranxianglei#7083, Windows-portable shutdown-signal test) while resolving the prior conflict. Clean auto-merge — the 3 commits touch src/server/handle.ts + side-lane/shutdown tests, none of which the PR modifies. typecheck clean.
(ai: vllm-qwen/qwen3.8-27b) CI conflict re-resolved for PR #6835 — the conflict had re-appeared because master advanced ~40 commits after my previous resolution. Merge state What I did this run
The conflict (2 auto-generated doc files, one module-ledger hunk each)
On the 7
Current state
No design decision, no new issue, no labels. Waiting on CI. 结构化八问
判定:冲突已解决并推送( |
[ework] CI fix verified green ✓ |
Summary
Closes #6832.
Explicit HTTP 400 content verdicts terminate compatibility recovery, preserve the latest response and reported usage, and do not teach a reasoning compatibility posture from quoted diagnostics.
Evidence
Merge Danger
Door: two-way
Blast Radius: transport
Changes terminal-error and usage handling across adapters. Ordinary compatibility errors retain their recovery paths. Kernel, schema and release version are unchanged. Human review is required before merge.