feat: re-send undecided interaction requests to reconnected remote clients - #64
Merged
Merged
Conversation
Merged
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
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.
Problem
session/request_permission/elicitation/createare one-shot requests raced across the clients connected at fire time (first response wins). A remote client that was offline when the agent asked (or dropped mid-wait) never sees the request; after reconnecting it still cannot answer — the reannounce dedup only records zcode ids (no re-prompt) and the session/load replay only re-sends pending tool_call cards, not interaction requests.Fix
src/handlers/server-requests.ts: every interaction wait inrequestWithTimeoutis tracked as anActiveInteraction— a cross-attempt first-response-wins race (method/params + deferred + per-attempt AbortControllers). The first attempt goes through the broadcast proxy as before; targeted re-sends join the same race and losers are aborted (SDK emits$/cancel_request, so Zed and the phone client dismiss their dialogs).src/index.ts: after a client'ssession/load/session/resumecompletes (the reconnect catch-up),resendPendingInteractionsre-sends that session's still-unanswered interaction requests to it, 300 ms delayed so the replay renders first. Connect-time resend was rejected deliberately: the phone client clearspermission/elicitationstate when a load starts, which would swallow an immediately re-sent dialog.requestthrows synchronously is funnelled into the rejection path: the resend fires from a timer callback, where a sync throw would crash the bridge.Verification
tests/interaction-resend.test.ts(reconnect adoption + loser cancel, session filtering, original-wins, interrupted-wait, already-answered, sync-throw survival).pnpm typecheck/pnpm lint/ full suite (42 files, 658 tests) pass.$/cancel_request; the request promise stays pending until the peer answers) and the phone client'sonCancelRequesthandling.docs/PROTOCOL.md: documented the reconnect-resend behavior in the interaction routing section.