fix(mcp): report configured timeout in MCP call errors

Track elapsed wall time in _run_on_mcp_loop, cancel the in-flight future when a timeout expires, and raise a descriptive TimeoutError that includes the elapsed and configured timeout. Add regression coverage for the new timeout diagnostics.
This commit is contained in:
Mason James 2026-04-15 12:59:10 -04:00 committed by Teknium
parent 25187ca05c
commit 80548f9a4f
2 changed files with 45 additions and 2 deletions

View file

@ -1942,7 +1942,8 @@ def _run_on_mcp_loop(coro, timeout: float = 30):
if loop is None or not loop.is_running():
raise RuntimeError("MCP event loop is not running")
future = asyncio.run_coroutine_threadsafe(coro, loop)
deadline = None if timeout is None else time.monotonic() + timeout
start_time = time.monotonic()
deadline = None if timeout is None else start_time + timeout
while True:
if is_interrupted():
@ -1953,7 +1954,12 @@ def _run_on_mcp_loop(coro, timeout: float = 30):
if deadline is not None:
remaining = deadline - time.monotonic()
if remaining <= 0:
return future.result(timeout=0)
future.cancel()
elapsed = time.monotonic() - start_time
raise TimeoutError(
f"MCP call timed out after {elapsed:.1f}s "
f"(configured timeout: {float(timeout):.1f}s)"
)
wait_timeout = min(wait_timeout, remaining)
try: