Repository navigation
Commit b053dae
committed
mcp: a session next to another build is refused within 5 s, not 30 s
A new MCP session whose build differs from the running daemon's waited the
whole 30 s startup budget for the other build to leave before it answered.
Clients give up on initialize sooner (Codex after 10 s by default), so the
agent saw a dead server and never the reason.
The MCP client now waits at most 5 s (MAIN_MCP_CONFLICT_WAIT_MS, never more
than the startup budget) for another build's cohort to leave. A session that
closes inside that window still lets the new build in. After it, the session
answers initialize, tools/list and every tools/call with the reason at once.
A lock that is only slow (BUSY, not a conflict) keeps the rest of the startup
budget, as before. CLI and hook clients are unchanged.
tests/test_mcp_conflict_refusal.sh drives a real daemon and a client with a
forced build fingerprint (new CBM_TEST_MCP_CLIENT_BUILD seam, TEST_SEAMS=1
builds only). It asserts the refusal content and that it comes within 12 s;
with the old 30 s wait it fails. Local-only, like the hook conflict test.
Signed-off-by: chidev <[email protected]>1 parent 850846a commit b053dae
2 files changed
Lines changed: 137 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
63 | 68 | | |
64 | 69 | | |
65 | 70 | | |
| |||
80 | 85 | | |
81 | 86 | | |
82 | 87 | | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
83 | 97 | | |
84 | 98 | | |
85 | 99 | | |
| |||
3321 | 3335 | | |
3322 | 3336 | | |
3323 | 3337 | | |
| 3338 | + | |
| 3339 | + | |
| 3340 | + | |
| 3341 | + | |
| 3342 | + | |
| 3343 | + | |
| 3344 | + | |
| 3345 | + | |
3324 | 3346 | | |
3325 | 3347 | | |
3326 | 3348 | | |
3327 | 3349 | | |
3328 | 3350 | | |
| 3351 | + | |
| 3352 | + | |
| 3353 | + | |
| 3354 | + | |
| 3355 | + | |
| 3356 | + | |
3329 | 3357 | | |
3330 | 3358 | | |
3331 | 3359 | | |
3332 | | - | |
3333 | | - | |
3334 | | - | |
| 3360 | + | |
3335 | 3361 | | |
3336 | 3362 | | |
| 3363 | + | |
| 3364 | + | |
| 3365 | + | |
| 3366 | + | |
| 3367 | + | |
| 3368 | + | |
| 3369 | + | |
| 3370 | + | |
| 3371 | + | |
| 3372 | + | |
3337 | 3373 | | |
3338 | 3374 | | |
3339 | 3375 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
0 commit comments