fix(cli/cliui): skip startup script logs when Wait=false #21105
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
a05caf2 to
92fa5b1
Compare
3ce5d2a to
38d9973
Compare
92fa5b1 to
73bd961
Compare
38d9973 to
65329a5
Compare
73bd961 to
380b15b
Compare
65329a5 to
9c77fcd
Compare
380b15b to
4ffc13f
Compare
9c77fcd to
cc5cf9a
Compare
4ffc13f to
1463cd8
Compare
cc5cf9a to
48a735a
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses issue #13580 by suppressing startup script logs when users explicitly set Wait=false (via --wait=no or CODER_SSH_WAIT=no). This prevents SSH operations like rsync and scp from dumping hundreds of lines of logs to stderr, which was breaking scriptability.
Key Changes:
- Modified
handleConnectedto only callstreamLogswhenWait=true, preventing log output in non-blocking mode - Stage indicators and warning messages are still displayed, only the log content is suppressed
- Added comprehensive test coverage for the new non-blocking behavior
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| cli/cliui/agent.go | Added conditional logic to skip streamLogs when Wait=false, suppressing log output while maintaining stage indicators and warnings |
| cli/cliui/agent_test.go | Added two new test cases verifying logs are suppressed in non-blocking mode, both when agent is already connected and after waiting for connection |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Member
📚 Documentation Check✨ No Changes NeededThis PR is an internal refactoring that improves code organization without changing user-facing behavior. The changes:
User-facing behavior remains unchanged:
The existing documentation in This comment was generated by an AI Agent through Coder Tasks |
mtojek
reviewed
Dec 5, 2025
| return agent.LifecycleState.Starting() | ||
| }) | ||
| if err != nil { | ||
| return err |
Member
There was a problem hiding this comment.
since we will call pollWhite in a few places, should wrap these errors?
mtojek
approved these changes
Dec 5, 2025
When users pass --wait=no or set CODER_SSH_WAIT=no, startup logs are no longer dumped to stderr. The stage indicator is still shown, just not the log content. Fixes #13580
48a735a to
6d43efd
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When users pass
--wait=noor setCODER_SSH_WAIT=no, startup logs are no longer dumped to stderr. The stage indicator is still shown, just not the log content.This addresses the issue where SSH operations like rsync and scp would dump hundreds of lines of startup logs, breaking scriptability.
Depends on #21104
Fixes #13580
Examples of output when using no wait:
Early attach:
During startup:
After startup (still shows warning, but no logs):