fixe: racing condition on conduit when printing #3308
Merged
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
brandonskiser
approved these changes
Oct 29, 2025
dingfeli
added a commit
that referenced
this pull request
Oct 29, 2025
dk19y
added a commit
that referenced
this pull request
Nov 4, 2025
* Revert "feat: Updates models to match latest, including endpoint resolver (#3262)" (#3288) This reverts commit 884b27f. * chore: bump version to 1.19.2 * fix: racing condition on conduit when printing (#3308) * chore: version bump to 1.19.3 (#3310) * refactor: migrate from directories to hierarchical paths module (#3309) - Replace directories module with new paths module using PathResolver pattern - Add workspace and global path scopes with clear separation of concerns - Implement static path methods to avoid circular dependencies in Database/Settings - Centralize all path constants and patterns in dedicated modules This refactoring improves path management consistency and provides a cleaner, more maintainable architecture for handling file system paths throughout the application. * Add auth login failure telemetry for cli (#3317) * add auth login failure telemetry * fix: expand ~ in prompt file:// URIs (#3301) * Refactor /Usage into smaller modules (#3324) Co-authored-by: Akhilesh Bontala <[email protected]> * feat: add agent crate (#3150) * refactor: centralize environment variable access (#3315) * Shim layer for env variable access * feat: warn when duplicate agents are found during load (#3335) * Upgrade delegate with better UX for notifications and change the file dependence. (#3337) * chore: move RTS code from agent crate to chat-cli (#3340) * fix: block dangerous patterns for tool calls (#3313) * first commit * disallowed dangerous patterns as a first priority for executing tools * recovered hooks help * got rid of removeme * got rid of space * refactored requires_acceptance to ensure correct ordering of safeguards and allowed commands * formatted for cargo again * chore: remove duplicate and unused API code from the agent crate (#3342) * Revert "feat: rebrand paths from .aws/amazonq/ and .amazonq/ to .kiro-cli/" This reverts commit 44dad82. * Revert "feat: rebrand environment variables from Q_/AMAZON_Q_ to KIRO_" This reverts commit 49cbe8e. --------- Co-authored-by: Brandon Kiser <[email protected]> Co-authored-by: Brandon Kiser <[email protected]> Co-authored-by: Felix Ding <[email protected]> Co-authored-by: abhraina-aws <[email protected]> Co-authored-by: Jonathan Little <[email protected]> Co-authored-by: Akhilesh Bontala <[email protected]> Co-authored-by: Akhilesh Bontala <[email protected]> Co-authored-by: ekang7 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue #, if available:
#3267
Description of changes:
This PR adds a notify - acknowledgement handshake before the event loop uses
InputSourceto prompt user.This is necessitated by the fact that what is actually writing to stderr or stdout is not on the same thread as what is prompting the user (in an ideal world they would be).
As a bandaid fix (to hold us until we move to the new event loop where everything is in their rightful place), we are first signaling to the ui layer we are about to prompt users, and we are going to wait until the ui layer acknowledges.
Note that this works because [std::sync::mpsc] preserves order between sending and receiving
Top: with fix
Bottom: v1.19.2
(Ignore the lack of diff highlighting, this was because of ui structured mode)
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.