Repository navigation
[PR] fix: validate Claude watchdog health payloads - #7220
ranxianglei merged 1 commit into
Conversation
[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b) 查重: 不重复. The PR independently compared 274 live fork branches + 89 upstream history commits for Verdict: APPROVE (pending full-suite CI green). I independently re-verified the fix, the tests, and the regression surface at PR head What I verified:
One non-blocking observation (DRY, not a blocker). This is now the 3rd inline copy of the Suggested labels (judged on this PR's own diff, not inherited from #7218): Auto-merge gate (§7.4): meets all eight (single-module, regression test reproduces the bug, no config/wire/kernel/persistence change, pure 结构化八问
收工判定:可合(待全量 CI 绿)。 干净、正确、最小、测试扎实的根因修复。 |
[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b) CI update: full suite now green. All The PR now meets the full §7.4 auto-merge gate (including "full-suite green on the pushed head"). Review verdict stands: APPROVE — ready for human merge. Merge stays human-only. |
Fixes #7218.
Problem
The Claude MCP watchdog accepts any successful HTTP status as a healthy proxy. An HTML page or a JSON
{"ok":false}reply with status 200 resets its consecutive-failure counter, so recovery never runs and MCP tools remain pinned to the unusable listener.Change
Require a successfully decoded health payload with
ok === true. The existing 2,000 msAbortSignalcovers both fetching the response and reading its body. Non-success statuses, invalid payloads and incomplete body reads return false. This keeps the current consecutive-failure threshold and existing recovery/settings behavior, without adding a TCP pre-probe or a second timeout budget.Validation
forwardToolrequest reaches the replacement listener with the expected arguments and conversation ID. Only the launcher result is injected; no real Claude process is started.okpayload remains unhealthy. A valid health response resets the consecutive-failure counter. Separate stalled-header and stalled-body cases exercise the original timeout through real sockets.npm run typecheck,npm run build,npm run check:test-import-graphandgit diff --checkpass. The CI process-test classifier reports no unregistered spawners across 1,358 test files.E2E_CHECK=1finds the Codex CLI and built dist, but the configured upstream at127.0.0.1:8199is unreachable. Real-model Codex phases have not run. Remote full-suite CI and the real-model merge gate remain outstanding.Prior work
Compared all 274 live fork branches and 89 upstream history commits for
src/claude-mcp-entry.ts(five complete file versions). The existing watchdog probe remains status-only. Actual patches in #1874, #3673, #6049, #3825 and #5242 were checked; shared three-state liveness/body-timeout changes do not update this private watchdog probe.