agent: cancel StreamAsk on close#4226
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the agent streaming implementation so callers can cancel in-flight model work when they close a StreamAsk/ResumeStreamAsk stream, and adds a regression test asserting that Close() cancels an in-flight model call.
Changes:
- Wrap
StreamAsk/resumeStreamAskcontexts withcontext.WithCanceland plumb the cancel func intoagentStream.Close(). - Add a test that verifies
Close()cancels a blocked modelGeneratecall.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
agent/stream.go |
Adds per-stream cancelation and triggers it from AgentStream.Close(). |
agent/stream_test.go |
Adds coverage to ensure closing a stream cancels an in-flight model call. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
79
to
83
| go func() { | ||
| defer close(events) | ||
| defer close(done) | ||
| resp, err := a.askWithStreamEvents(ctx, message, events) | ||
| resp, err := a.askWithStreamEvents(streamCtx, message, events) | ||
| if err != nil { |
Comment on lines
103
to
107
| go func() { | ||
| defer close(events) | ||
| defer close(done) | ||
| resp, err := a.resumeWithStreamEvents(ctx, runID, events) | ||
| resp, err := a.resumeWithStreamEvents(streamCtx, runID, events) | ||
| if err != nil { |
This was referenced Jul 7, 2026
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.
Summary:
Testing:
Closes #4217
Closes #4225