Interrupt running shell tool commands #365
Merged
Conversation
This file contains 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
baxen
approved these changes
Nov 28, 2024
| break; | ||
| } | ||
| Err(_) => { // Heartbeat, used to detect disconnected clients and then end running tools. | ||
| if let Err(e) = tx.try_send(ProtocolFormatter::heartbeat()) { |
There was a problem hiding this comment.
nit: should we use tx.is_closed instead of sending a heartbeat?
There was a problem hiding this comment.
That worked somehow, I've removed the sending of heartbeat events.
michaelneale
added a commit
that referenced
this pull request
Nov 28, 2024
* v1.0: fix: During configure remove 'recommended' from provider descriptions (#372) [cli] On interrupt repair messages (#370) feat: add low priority user output for bash feat: collapse long tool args (#368) feat: Hardened runtime and notarization (#367) feat: use mac main menu (#366) [app] Turn send button into stop button when goose is responding so user can cancel if needed [app] Fix position for MoreMenu and make top region a little smaller feat [cli]: Add keyring management for OpenAI API keys (#361) Interrupt running shell tool commands (#365) [GUI multiprocess] tabless multiple goosed processes per window (#355) feat: simplify initial session splash (#362) fix: hide response form behind flag
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.
This PR makes it so that interrupts to the
agent.replystream kills the running the bash process if there is one. Essentially it is relying on resources being cleaned up when the stream is cleaned up (leaves scope). So its a shortish term solution that is ok given the majority of systems will be network calls in the future and the shell commands are the most important to be killing atm. To make this work required 2 changes:Tested via checking if a running shell command was halted part way through on interrupt. Eg.
run a shell command for 15 seconds that every seconds writes its current iteration number to test.mdNote I have not included an updated ui/desktop/src/bin/goosed so this will be required for people to see the difference. Let me know if I should be including it