fix: Telegram interrupts are blocked behind the streaming session mutex#888
Open
sam-saffron-jarvis wants to merge 1 commit into
Open
fix: Telegram interrupts are blocked behind the streaming session mutex#888sam-saffron-jarvis wants to merge 1 commit into
sam-saffron-jarvis wants to merge 1 commit into
Conversation
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.
What changed
streamReplyfor long-running stream serialization.cancelMu, so a second Telegram message can cancel or interject while the first response/tool run is still streaming.handleMessageaccept the existing Telegram bot interface so the end-to-end interrupt path can be tested with a fake bot.handleMessage, and asserts the first stream context is cancelled before the provider is otherwise released.Why this is high-value
Sam uses the Telegram/Jarvis path daily, and a follow-up message during a long answer or tool run should be able to stop or steer the work immediately. Previously the second handler blocked on
sess.muin the idle-timeout check, butstreamReplyholds that mutex for the entire stream, so the cancel/interject logic could not run until the original work was already done.Validation
go test ./internal/serve -run TestHandleMessage_CancelInterruptReachesActiveStreamBeforeSessionMutex -count=1 -vgo build ./...go test ./...git diff --check