fix: resolve pending waits when WebSocket disconnects#38
Merged
AdirAmsalem merged 1 commit intomainfrom Mar 14, 2026
Merged
Conversation
Extract _resolve_pending_waits() from _handle_error() and also call it in _receive_messages() finally block so that WS disconnects during the initial-state phase surface immediately instead of timing out after 30s.
AdirAmsalem
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
asyncio.Eventwaits now resolve immediately instead of timing out after 30s._resolve_pending_waits()from the duplicate logic in_handle_error()and also call it in_receive_messages()'sfinallyblock.Problem
_handle_error()already had fail-fast resolution for server errors during Phase 2 (added in PR #32), but a WebSocket disconnect only set state to"disconnected"without resolving the pending events. This meant_send_initial_image_and_wait(),_send_initial_prompt_and_wait(), and_send_passthrough_and_wait()would hang for the full 30s timeout on WS close.Fix
_resolve_pending_waits(error_message)._handle_error()(server errors, existing behavior) and_receive_messages() finally(WS disconnect, new behavior).Tests
All 35 existing tests pass, including the 3 fail-fast tests that exercise the same
_resolve_pending_waitscodepath.